i18n: automatic bump

Change-Id: I95e2241f629369ba46891cfb878bde5e0a4d43cf
diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index abdd5b5..83b7430 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index e423d18..c66a0b3 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>محادثات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>خطأ عند محاولة تولد الرمز الشريطي</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>أضف إلى الاتصالات المعروفة</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>يريد التحدث إليك!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>أجب</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>تجاهل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>نسخ الرقم</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>غادر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>عن RING</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>استيراد</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>إختار ملف</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>وثائق (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>إختار ملف</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>وثائق (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>تقاسم كل الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>تقاسم منطقة من الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>تقاسم الوثيقة</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>اختر اسم مستخدمك</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>التالي</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>فتح ملف</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 30ac9ca..3aa55e6 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Разговори</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Грешка при създаването на QR-код</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Добавяне към контактите</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Желае да говори с Вас!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Отговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Игнориране</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Копиране на номера</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Входящо съобщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Входящо повикване от %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Изход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Относно</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Направи снимка</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>или</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Внасяне</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Изберете файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Всички файлове (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Изберете файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Всички файлове (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Споделяне на целия екран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Споделяне на област от екрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Споделяне на файл</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Свързване на това устройство с акаунт</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Създаване на профил</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Създаване на профил</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Регистриране на публично име (експериментално)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Изберете потребителско име</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Потвърдете паролата</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Предишен</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Напред</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Отваряне на файл</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 1a6548c..8f2ab38 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Converses</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Afegir als contactes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copia el número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Quant a</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Fer foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importa</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Compartir pantalla</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Compartir arxiu</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Enllaça aquest dispositiu a un compte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Crei el seu perfil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Crei el seu perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Endavant</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index 8f06e1e..4d66e34 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Konverzace</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dvakrát klepněte pro kopírování</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Chyba při vytváření QR kódu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Přidat do kontaktů</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Chce s vámi hovořit!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Přijmout</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Přehlížet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Zkopírovat číslo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Příchozí zpráva od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Příchozí hovor od %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Odejít</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Vyfotit</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>nebo</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importovat</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Vybrat soubor</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Soubory (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Vybrat soubor</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Soubory (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Sdílet celou obrazovku</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Sdílet část obrazovky</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Sdílet soubor</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Vítejte v</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Připojit toto zařízení k účtu</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Jak přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Vytvořit vlastní profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Vytvořit vlastní účet</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Vytvořit vlastní profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Vytvořit vlastní účet</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Zaregistrovat jméno veřejně (experimentální)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Zvolte si uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Hledá se...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Zadejte PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Potvrdit heslo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Další</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Uživatelské jméno není dostupné.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Uživatelské jméno je dostupné.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Uživatelské jméno je neplatné.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Chyba sítě.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index c384fe6..0d4c2ff 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Tekstinput for søg efter kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Del ring-ID-knap</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklik for at kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Fejl ved generering af QR-kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Tilbage til hjemmeside-knap</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Tilføj til kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Vil tale med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorer indgående opkald-knap</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Besvar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Fjern kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Bloker kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Besked ankommet fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Tag billede</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importer foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importér</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Del hele skærmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Del skærmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Tilknyt enhed-knap</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Tilknyt denne enhed til en konto</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Tilknyt konto til enhed fra netværket</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Tilknyt konto fra DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Tilknyt fra eksporteret konto-arkivfil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Tilknyt konto fra fil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Tilføjelse af enhed</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Vælg fil som skal importeres</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Opret din profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Skriv dit fulde navn:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Opret din konto</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Vælg fil som skal importeres</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Opret din profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Skriv dit fulde navn:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Opret din konto</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Vælg dit brugernavn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Søger...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Tekstindtastning for PIN til enhedstilknytning</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Indtast din PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Tekstinput for adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Tekstindtastning for adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Tekstinput for bekræftelse af adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Bekræft adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Forrige side-knap</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Tilbage</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Næste side-knap</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Næste</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Din konto kræver migrering. Indtast din adgangskode.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Tilføj enhed</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Brugernavn er ikke tilgængeligt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Brugernavn er tilgængeligt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Brugernavn ikke gyldigt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Netværksfejl.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Åbn fil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 27b7208..604b5ec 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklik for at kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Fejl ved generering af QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Tilføj til kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Vil tale med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Besvar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Besked ankommet fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Tag billede</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importer foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importér</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished">Vælg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished">Filer (*)</translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Del hele skærmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Del skærmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Tilknyt denne enhed til en konto</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Sådan tilføjes en enhed</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Opret din profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Skriv dit fulde navn:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Opret din konto</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Opret din profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Skriv dit fulde navn:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Opret din konto</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Vælg dit brugernavn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Søger...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Indtast din PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Bekræft adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Tilbage</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Næste</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Din konto kræver migrering. Indtast din adgangskode.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Tilføj enhed</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Brugernavn er ikke tilgængeligt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Brugernavn tilgængeligt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Brugernavn ikke gyldigt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Netværksfejl.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Åbn fil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index c97598f..512d394 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Unterhaltungen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Doppelklick zum kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Fehler bei der Erstellung des QR-Codes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Zu Kontakten hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Möchte mit dir Sprechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Entferne Kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Eingehende Nachricht von %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Eingehender Anruf von %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Ein Foto aufnehmen</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>oder</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Foto importieren</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Import</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Dateien (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Dateien (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Gesamten Bildschirm teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Bildschirmbereich teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Datei teilen</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Willkommen bei</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem Konto verknüpfen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Wie kann ich ein neues Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Erstellen Sie Ihr Profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Geben Sie Ihren vollständigen Namen ein</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Legen Sie ein Benutzerkonto an</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Erstellen Sie Ihr Profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Geben Sie Ihren vollständigen Namen ein</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Legen Sie ein Benutzerkonto an</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Nutzername wählen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Suchen...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Geben Sie Ihre PIN ein</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Passwort bestätigen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Vorherige</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ihr Ring-Konto muss migriert werden. Bitte geben Sie Ihr Passwort ein.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Benutzername nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Benutzername verfügbar.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Benutzername ist ungültig.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Netzwerkfehler</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index 982054c..4000489 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -687,6 +687,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -725,32 +733,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -758,150 +766,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Kontakte hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -965,17 +973,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
@@ -996,42 +1004,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1039,12 +1027,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1148,17 +1136,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1507,147 +1495,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem Ring-Konto verknüpfen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1657,170 +1569,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Konto bestätigen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index ed9b7c6..af3bf20 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Συνομιλίες</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Προσθήκη στις επαφές</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Αντιγραφή αριθμού </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -930,7 +938,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
         <source>Delete</source>
-        <translation type="unfinished"/>
+        <translation>Διαγραφή</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Έξοδος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Περί</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Λήψη φωτογραφίας</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Εισαγωγή</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Μοίρασμα περιοχής της οθόνης</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Μοίρασμα αρχείου</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Σύνδεση αυτής της συσκευής με ένα λογαριασμό</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Συνθηματικό</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Προηγούμενο</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Επόμενο</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Άνοιγμα αρχείου</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index ea8c488..3278dde 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index fd7cfb6..bbb2365 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Konversacioj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Eraro dum generado de QR Kodo</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Aldoni al kontaktoj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Volas paroli kun vi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Respondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Malatenti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopii numeron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Mesaĝo eniranta de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Voko eniranta de %1</translation>
     </message>
@@ -930,7 +938,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
         <source>Delete</source>
-        <translation type="unfinished"/>
+        <translation>Forigi</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>Agordoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Eliri</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Pri</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Foti</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>aŭ</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Enporti</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Elektu dosieron</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Dosieroj (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Elektu dosieron</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Dosieroj (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Kunhavigi tutan ekranon</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Kunhavigi areon de ekrano</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Kunhavigi dosieron</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Elektu vian uzantnomon</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Pasvorto</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Konfirmu pasvorton</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Antaŭa</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Sekva</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Malfermi Dosieron</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 2aeaa1c..4ad1805 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -581,7 +581,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2644"/>
         <source>Export on the network</source>
-        <translation type="unfinished"/>
+        <translation>Exportar a la red</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation type="unfinished"/>
+        <translation>Jami es software libre para la comunicación universal que respeta las libertades y la privacidad de sus usuarios.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar la Ring ID como código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Botón de compartir el ID de Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Doble click para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Hubo un error al generar el código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Añadir a contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>¡Quiere charlar contigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Contestar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar llamada saliente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Eliminar contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copiar Número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Recibido mensaje de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Llamada entrante de %1</translation>
     </message>
@@ -964,24 +972,24 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Sacar una foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importar foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Examinar</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Ficheros (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Examinar</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Ficheros (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Compartir toda la pantalla</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Compartir la ventana</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Compartir archivo</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Etiqueta de Bienvenida</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Bienvenido(a) a</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Logo de Bienvenida</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Botón de vincular dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Conectar este dispositivo a una cuenta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Vincule cuenta desde archivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Cómo agregar un dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Seleccione el archivo a importar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Crea tu perfil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Introduzca su nombre completo:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Editar nombre completo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Crea tu cuenta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Seleccione el archivo a importar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Crea tu perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Introduzca su nombre completo:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Editar nombre completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Crea tu cuenta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrar un nombre público (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Editar nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Elije un nombre de usuario para ti</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Editar PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Escribe tu PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmar contraseña</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Botón de página anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Botón de página siguiente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Debe migrar su cuenta. Introduzca su contraseña.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Añadir un dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Nombre de usuario no disponible.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Nombre de usuario disponible.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Nombre de usuario incorrecto.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Error de red.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Abrir fichero</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index a7f9795..fc13992 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Doble click para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Error al generar el Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Agregar a contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>¡Quiere hablar con vos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Mensaje entrante de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Llamada entrante de %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Tomar foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>o</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importar foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Archivos (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Archivos (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Compartir archivo</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Bienvenido a</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Vincular este dispositivo a una cuenta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Seleccioná el archivo para importar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Creá tu perfil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Ingresá tu nombre completo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Creá tu cuenta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Seleccioná el archivo para importar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Creá tu perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Ingresá tu nombre completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Creá tu cuenta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrar nombre de usuario público (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Editar nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Elegí tu nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Editar PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Ingresá tu pin</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmar contraseña</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Añadir un dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Nombre de usuario no disponible.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Nombre de usuario disponible.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Nombre de usuario inválido.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Abrir Archivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index dab0942..a5d26c8 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>vasta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index 4a1ba3c..d99e25f 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Honi buruz</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Estekatu gailua kontu batekin</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index a6a4871..be8bc42 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>نمایش مکالمات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation> گفتگو</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>به اشتراک گذاری دکمه آیدی رینگ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>برای کپی کردن دو بار کلیک کنید</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>خطا در هنگام تولید کد QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>افزودن به مخاطبان</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>نمایش دعوت ها</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>دعوت ها</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>میخواهد با شما حرف بزند!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>دکمه پاسخ به تماس ورودی</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>پاسخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>رد</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>لغو تماس خروجی</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>شروع تماس ویدیویی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>شروع مکالمه صوتی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>پاک کردن مکالمه</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>حذف مخاطب</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>مسدودسازی مخاطب</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>رونوشت از شماره</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>پیام دریافتی از 1%</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>تماس ورودی از %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>خروج</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>درباره</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>عکس  بگیرید!</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>یا</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>انتخاب فایل</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>فایل‌ها (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>انتخاب فایل</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>فایل‌ها (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>به اشتراک گذاری تمام صفحه نمایش</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>هم‌رسانی پرونده</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>برچست خوش آمد</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>خوش آمدید به</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>لوگو خوش آمد</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>دکمه پیوند دستگاه</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>پیوند این دستگاه به یک حساب</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>متد انتخاب پیوند</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>پیوند حساب ها از DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>پیوند حساب از فایل</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>چگونه یک دستگاه جدید اضافه کنیم</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>مسیر آرشیو حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>انتخاب کننده مسیر آرشیو حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>گذرواژه آرشیو:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>ورودی گذرواژه آرشیو</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>پروفایل خود را بسازید</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>نمایش آواتار</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>نام کامل خود را وارد کنید:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>ویرایش نام کامل</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>حساب کاربری خود را بسازید</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>مسیر آرشیو حساب کاربری</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>انتخاب کننده مسیر آرشیو حساب کاربری</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>گذرواژه آرشیو:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>ورودی گذرواژه آرشیو</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>پروفایل خود را بسازید</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>نمایش آواتار</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>نام کامل خود را وارد کنید:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>ویرایش نام کامل</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>حساب کاربری خود را بسازید</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>ثبت نام کاربری عمومی (آزمایشی)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>ویرایش نام کاربری عمومی</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>نام کاربری خود را انتخاب کنید</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>وضعیت تایید نام کاربری عمومی</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>در حال جستجو...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>ویرایش PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>پین خود را وارد کنید</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>ورودی متن گذرواژه</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>گذرواژه</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>تأیید گذرواژه</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>دکمه صفحه قبلی</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>پیشین</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>دکمه صفحه بعد</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>بعدی</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>افزودن یک دستگاه</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>نام کاربری در دسترس نیست.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>نام کاربری موجود می باشد.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>نام کاربری موجود نمی باشد.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>خطا شبکه.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>باز کردن فایل</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index c26e32b..31554c4 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Keskustelu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Virhe generoidessa QR-koodia</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Lisää yhteystietoihin</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Haluaa puhua kanssasi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Vastaa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Sivuuta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopioi numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Saapuva puhelu %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Poistu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Tietoa</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Ota valokuva</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>tai</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Tuo valokuva</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Tuo</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Valitse tiedosto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Tiedostot (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Valitse tiedosto</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Tiedostot (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Jaa näyttö</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Jaa osa näytöstä</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Jaa tiedosto</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Valitse käyttäjänimesi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Etsitään...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Varmista salasana</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Seuraava</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index ab0d696..fc07d57 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Montrer les conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Rechercher le texte du contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation type="unfinished"/>
+        <translation>Jami est un logiciel libre de communication universel qui respecte la vie privée et l&apos;intimité de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Montrer le code QR d&apos;identification ring </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Partager le bouton d&apos;identification ring </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Double-cliquez pour copier</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Erreur pendant la génération du QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Bouton de retour a la page d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Montrer les invitations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Invitations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>souhaite entrer en communication !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Bouton de réponse d&apos;appel </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Bouton de refus d&apos;appel </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Annuler l&apos;appel sortant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Démarrer un appel vidéo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Démarrer un appel audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Effacer la conversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Retirer le contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Bloquer le contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copier le numéro ou identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Message en provenance de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Sortir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Affichage du photomaton</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Prendre une photo</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importer la photo</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importer</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Partager tout l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Partager une partie de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Partager un fichier</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation>Assistant de création de compte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>étiquette de bienvenue</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Bienvenue sur</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Logo d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Bouton pour lier le compte de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Appuyez sur le bouton pour déclencher la liaison de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Lier cet appareil à un compte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Sélectionner la méthode de couplage</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Lier le compte à l&apos;appareil depuis le réseau</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Lier le compte depuis la table de hachage distribuée</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Lier depuis une archive du compte exportée</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Lier le compte depuis un fichier</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Comment ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Sélectionner le fichier à importer</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Chemin de l&apos;archive du compte</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Sélectionner le chemin de l&apos;archive du compte</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Archiver le mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Entrée du mot de passe d&apos;archive</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Créez votre profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Widget de photomaton</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Affichage de l&apos;avatar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Entrer votre nom complet :</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Modification du nom complet</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Entrée de texte pour l&apos;ajout du nom complet</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Créez votre compte</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Sélectionner le fichier à importer</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Chemin de l&apos;archive du compte</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Sélectionner le chemin de l&apos;archive du compte</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Archiver le mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Entrée du mot de passe d&apos;archive</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Créez votre profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Widget de photomaton</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Affichage de l&apos;avatar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Entrer votre nom complet :</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Modification du nom complet</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Entrée de texte pour l&apos;ajout du nom complet</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Créez votre compte</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>case à cocher nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Case à cocher si l&apos;utilisateur veut un identifiant public</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Enregistrer un nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Modification de l&apos;identifiant public</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Choisissez un nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Statut de validation de l&apos;identifiant public</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Recherche de disponibilité...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Édition du NIP</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Champ de saisie du NIP de l&apos;appareil associé</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Entrer votre NIP</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Saisie du mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Saisie de mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Texte de confirmation de l&apos;entrée du mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Bouton de la page précédente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>Appuyez sur le bouton pour accéder à la page précédente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>bouton prochaine page</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Appuyez sur le bouton pour accéder à la page suivante de l&apos;assistant</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Votre compte doit être migré. Entrez votre mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Importation de l&apos;archive du compte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Nom d&apos;utilisateur indisponible</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Nom d&apos;utilisateur disponible</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Nom d&apos;utilisateur invalide</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Erreur de réseau</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index 9380f26..34d4d37 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Bouton partager l&apos;identificateur Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Une erreur s&apos;est produite lors de la génération du code QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>veut vous parler!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Répondre à l&apos;appel entrant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorer l&apos;appel entrant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Réponse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copier le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Message entrant de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importation</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Choisir le fichier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Choisir le fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Partager la totalité de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Partager une partie de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Partager le fichier</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Associer cet appareil à un compte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Sélectionner une méthode de lien</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Lier un compte à partir d&apos;un fichier</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Sélectionner un fichier à importer</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Créer votre profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Entrez votre nom complet</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Modification du nom complet</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Créez votre compte</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Sélectionner un fichier à importer</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Créer votre profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Entrez votre nom complet</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Modification du nom complet</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Créez votre compte</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Enregistrer un nom d&apos;utilisateur public (expérimental)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Modification du nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Choisissez votre nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>En cours de recherche ...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Modification de l&apos;épingle</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Entrez votre NIP</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Entrée du mot de passe </translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Mot de confirmation de saisie de texte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Bouton page précédente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Bouton page suivante</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Appuyer sur le bouton pour accéder à la prochaine page de l&apos;assistant</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Nom d&apos;utilisateur non-disponible</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Erreur de réseau</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index 08646fc..6fdbbd9 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Ajouter dans les contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copier le numéro de téléphone</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -930,7 +938,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
         <source>Delete</source>
-        <translation type="unfinished"/>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>A propos </translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index e772ea1..1e9c555 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>דיונים</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>העתק מספר</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>אודות</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>בחר קובץ</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>קבצים (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>בחר קובץ</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>קבצים (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>שתף אזור מסך</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>שתף קובץ</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>סיסמה</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>קדימה</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index c40c906..3574696 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index 080c39f..64606c6 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Razgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Greška prilikom generiranja QR koda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Dodaj u kontakte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti sa vama!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Javi se</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopiraj broj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Dolazni poziv od %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Izađi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ili</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Uvezi</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Izaberite datoteku</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Izaberite datoteku</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Dijelite područje zaslona</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Dijeli datoteku</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Napravite vaš profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Napravite vaš račun</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Napravite vaš profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Napravite vaš račun</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Izaberite vaše korisničko ime</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Potvrdi lozinku</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Slijedeće</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Otvori datoteku</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index aea4445..2e7d826 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -31,7 +31,8 @@
         <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Jami.
 Jami is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>A Microsoft Windows ügyfél a Jamihoz.
+A Jami egy biztonságos és osztott csevegőprogram.</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -89,7 +90,7 @@
     <message>
         <location filename="../accountdetails.ui" line="350"/>
         <source>Public registered username</source>
-        <translation type="unfinished"/>
+        <translation>Nyilvános regisztrált felhasználónév</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="426"/>
@@ -126,7 +127,7 @@
     <message>
         <location filename="../accountdetails.ui" line="832"/>
         <source>Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Fiók beállítások</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
@@ -581,7 +582,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2644"/>
         <source>Export on the network</source>
-        <translation type="unfinished"/>
+        <translation>Fiók exportálása a hálózaton</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -607,7 +608,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2565"/>
         <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
+        <translation>Ahhoz hogy új eszközt adjon a Jami fiókjához, exportálnia kell a fiókját a hálózaton. Ez előállít egy PIN-t, amit meg kell adnia az új eszközén, az előállítástól számított 5 percen belül.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2641"/>
@@ -686,6 +687,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,183 +733,185 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Beszélgetések megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Beszélgetések</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Keresés kapcsolati szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
-        <translation type="unfinished"/>
+        <translation>Partnerek keresése vagy azonosító beírása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami a szabad szoftver az egyetemes közléshez, amely tiszteletben tartja a felhasználók szabadságát és magánéletét.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
                                       </source>
-        <translation type="unfinished"/>
+        <translation>
+Ez az Ön azonosítója.
+Másolja és ossza meg a barátaival!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Jami azonosító QR-kód mutatása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Ring azonosító megosztó gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Kattintson duplán a másolásra</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Hiba a QR kód generálása közben</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation>legjobb név</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation>legjobb azonosító</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Vissza a főoldalra gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Hozzáadás a partnerekhez</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Meghívás megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Meghívás</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Beszélni akar önnel!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Bejövő hívás fogadása gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Bejövő hívás figyelmen kívül hagyása gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Válaszol</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Figyelmen kívül hagy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Kimenő hívás visszavonása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Videóhívás indítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Hanghívás indítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Beszélgetés törlése</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Partner eltávolítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
-        <translation>Blokkolt partner</translation>
+        <translation>Partner letiltása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Szám másolása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
-        <translation type="unfinished"/>
+        <translation>Lépjen kapcsolatba velem a Jami-n</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
-        <translation type="unfinished"/>
+        <translation>Az azonosítóm:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Bejövő üzenet a következőtől: %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Bejövő hívás tőle: %1</translation>
     </message>
@@ -910,22 +921,22 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="35"/>
         <source>Account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Fiók eltávolítása</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="55"/>
         <source>Do you really want to delete the following account?</source>
-        <translation type="unfinished"/>
+        <translation>Tényleg törli ezt az fiókot?</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="135"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
-        <translation type="unfinished"/>
+        <translation>Ha ezt a fiókot nem exportálták vagy hozzáadták egy másik eszközhöz, akkor ez el fog veszni.</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="212"/>
         <source>Permanently delete account</source>
-        <translation type="unfinished"/>
+        <translation>Fiók végleges törlése</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
@@ -935,7 +946,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
         <source>Cancel account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Fiók eltávolítás megszakítása</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="256"/>
@@ -958,30 +969,30 @@
     <message>
         <location filename="../invitebuttonswidget.ui" line="136"/>
         <source>Block person</source>
-        <translation>Személy blokkolása</translation>
+        <translation>Személy letiltása</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Névjegy</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1006,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Fénykép automata kijelző</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Fotó készítése</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>vagy</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Fénykép importálása</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importálás</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Fájl kiválasztása</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Fájlok (*)</translation>
     </message>
@@ -1038,12 +1029,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Fájl kiválasztása</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Fájlok (*)</translation>
     </message>
@@ -1058,24 +1049,24 @@
     <message>
         <location filename="../settingsitemwidget.cpp" line="68"/>
         <source>Edit Device Name</source>
-        <translation type="unfinished"/>
+        <translation>Eszköznév szerkesztése</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="74"/>
         <source>Unlink Device From Account</source>
-        <translation type="unfinished"/>
+        <translation>Ezen eszköz fiókhoz kikapcsolása</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="90"/>
         <source>Unblock Contact</source>
-        <translation type="unfinished"/>
+        <translation>Partner letiltás feloldása</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
         <source>Jami account</source>
         <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
+        <translation>Jami fiók</translation>
     </message>
 </context>
 <context>
@@ -1147,17 +1138,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Az egész képernyő megosztása</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Képernyő részének megosztása</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Fájl megosztása</translation>
     </message>
@@ -1172,7 +1163,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Jami fiók migrációja…</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1212,7 +1203,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Jami archív fájlok (*.gz);; Minden fájl (*)</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1279,17 +1270,17 @@
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
         <source>Create Jami account button</source>
-        <translation type="unfinished"/>
+        <translation>Jami fiók létrehozása gomb</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
         <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Nyomógomb a Jami fiók létrehozás indításának aktivizálásához </translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Jami account</source>
-        <translation type="unfinished"/>
+        <translation>Jami fiók létrehozása</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1338,7 +1329,16 @@
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Először az eszköz összekapcsolása egy másik fiókkal &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt; meg kell szereznie a PIN-kódot &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;A PIN kód létrehozása:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Menjen a&lt;span style=&quot; font-weight:600;&quot;&gt;Fiókkezelés beállítása &lt;/span&gt;egy korábbi eszközről &lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Válassza a &lt;span style=&quot; font-weight:600;&quot;&gt;Jami fiók &lt;/span&gt;szeretné használni&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Menjen a&lt;span style=&quot; font-weight:600;&quot;&gt;Eszközök&lt;/span&gt;lap&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Válassza&lt;span style=&quot; font-weight:600;&quot;&gt;Eszköz hozzáadása&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Kapja meg a szükséges PIN-kódot az űrlap kitöltéséhez. A PIN -kód csak érvényes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 percig&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="357"/>
@@ -1388,7 +1388,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="670"/>
         <source>Register your username on the network. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <translation>Regisztrálja felhasználónevét a hálózaton. Ez fenntartja a felhasználónevet, hogy csak Ön tudja használni. Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító használata helyett.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="673"/>
@@ -1460,7 +1460,7 @@
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Jami fiók létrehozása…</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -1506,147 +1506,71 @@
         <translation>Fiók létrehozása varázsló párbeszédpanel</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Üdvözlő címke</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Isten hozott</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Üdvözlő jelkép</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Összekapcsoló eszköz gombja</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Nyomógomb a készülék összekapcsolásának indítási triggerjére</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Ezen eszköz fiókhoz kapcsolása</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Válasszon összekapcsolási módszert</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Csatlakoztassa a fiókot az eszközhöz a hálózatról</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Fiók összekapcsolása DHT-ből</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Exportált fiók összekapcsolása archív fájlból</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Fiók összekapcsolása fájlból</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Hogyan adjunk egy eszközt hozzá</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Válassza ki az importálni kívánt fájlt</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Fiók archívum útvonal:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Fiók archívum útvonal választó </translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Archívum jelszó:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Archívum jelszó bevitele</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Saját profil létrehozása</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Fénykép automata modul</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Avatar megjelenítése</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>A teljes név megadása:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Teljes név szerkesztése</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Szövegbevitel a teljes névbevitelhez</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Fiók létrehozása</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,172 +1580,248 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Válassza ki az importálni kívánt fájlt</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Fiók archívum útvonal:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Fiók archívum útvonal választó </translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Archívum jelszó:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Archívum jelszó bevitele</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Saját profil létrehozása</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Fénykép automata modul</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Avatar megjelenítése</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>A teljes név megadása:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Teljes név szerkesztése</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Szövegbevitel a teljes névbevitelhez</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Fiók létrehozása</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation>Jami fiók létrehozása gomb</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation>Nyomógomb a Jami fiók létrehozás indításának aktivizálásához </translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation>Jami fiók létrehozása</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
+        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
+        <translation>Regisztrálja felhasználónevét a Jami-n. Ez fenntartja a felhasználónevet, hogy csak Ön tudja használni. Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító használata helyett.</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Nyilvános felhasználónév jelölőnégyzet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Válassza ki a jelölőnégyzetet, ha a felhasználó nyilvános felhasználónevet szeretne</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Nyilvános felhasználónév regisztrálása (kísérleti):</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Nyilvános felhasználónév szerkesztés</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Válasszon egy felhasználónevet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Nyilvános felhasználónév ellenőrzése állapot</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Keresés…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>PIN-kód szerkesztése</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Eszköz összekapcsolása PIN-kód szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>PIN-kód megadása</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Jelszó szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Jelszó beírása</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Jelszó megerősítési szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Jelszó megerősítése</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Jami fiók létrehozása…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Előző oldal gombja</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>nyomógomb az előző oldal hozzáférésének varázslója</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Vissza</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Következő oldal gombja</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Nyomógomb a következő oldal hozzáférésének varázslója</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Tovább</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Fiókját át kell vinni. Adja meg a jelszavát.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Jami fiók migrációja…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Fiók archívum importálása…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Eszköz hozzáadása</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Felhasználónév nem elérhető.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Felhasználónév elérhető.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Felhasználónév érvénytelen.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Hálózati hiba.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Fájl megnyitása</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Jami archív fájlok (*.gz);; Minden fájl (*)</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index b0ac9ac..d4c8b5e 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Tambah sebagai kontak</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Salin nomor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Selanjutnya</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 375b0e3..d7a1481 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Converzazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Aggiungi contatti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copia il numerp</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Scattare una foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importare</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Condividere una porzione dello schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Condividere file</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confermare password</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Seguente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 7849a83..7a36875 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Errore durante la generazione del Codice QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Aggiungi alla rubrica</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Vuole parlare con te!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copia numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Messaggio in arrivo da %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Chiamata in arrivo da %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Info</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Scatta una foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>oppure</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importa</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Scegli un file</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Files (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Scegli un file</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Files (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Condividi l&apos;intero schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Condividi l&apos;area dello schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Condividi file</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Collega questo dispositivo ad un account</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Crea il tuo profilo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Crea il tuo account</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Crea il tuo profilo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Crea il tuo account</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registra un nome utente pubblico (sperimentale)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Precedente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Prossimo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Apri File</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 3b58034..aa3a5c9 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>会話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>連絡先に追加</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>応答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>番号をコピー</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>画面を共有</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>ファイルを共有</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>このデバイスをアカウントへリンク</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>プロフィールを作成</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>プロフィールを作成</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>公開ユーザー名を登録 (実験的)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>パスワードの再入力</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>次へ</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index 17b4571..9125d46 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>더블클릭으로 복사하기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>QR 생성 중 오류</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>연락처에 추가하기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>당신과 이야기하고 싶어합니다!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>응답</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>무시</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>%1로부터 메시지</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>설정</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>종료</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>사진 찍기</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>또는</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>사진 가져오기</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>가져오기</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>파일 선택하기</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>파일들 (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>파일 선택하기</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>파일들 (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>전체화면 공유하기</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>화면 영역 공유하기</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>파일 공유하기</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>환영합니다</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>이 장치를 계정에 연결하기</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>장치를 추가하는 법</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>프로필 만들기</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>풀 네임을 입력하세요:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>계정 생성하기</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>프로필 만들기</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>풀 네임을 입력하세요:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>계정 생성하기</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>공개 사용자명을 등록하세요 (실험중)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>사용자명 선택</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>검색 중...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>PIN 번호를 입력하세요.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>암호</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>암호 확인</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>이전</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>다음</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>당신의 계정은 이전이 필요합니다. 암호를 입력하세요.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>장치 추가하기</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>사용할 수 없는 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>사용 가능한 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>올바르지 않은 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>네트워크 오류</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>파일 열기</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 873295e..efe3688 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -126,7 +126,7 @@
     <message>
         <location filename="../accountdetails.ui" line="832"/>
         <source>Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Paskyros nustatymai</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Pokalbiai</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Spustelėkite du kartus, norėdami nukopijuoti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Klaida, kuriant QR kodą</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Pridėti prie kontaktų</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Nori su jumis pakalbėti!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Atsiliepti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Nepaisyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Šalinti kontaktą</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopijuoti numerį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Gauta žinutė nuo %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Gaunamasis skambutis nuo %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Išeiti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Apie</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Padaryti nuotrauką</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>arba</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importuoti nuotrauką</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importuoti</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Pasirinkti failą</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Failai (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Pasirinkti failą</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Failai (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Bendrinti visą ekraną</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Bendrinti ekrano sritį</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Bendrinti failą</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation>Paskyros sukūrimo vediklio dialogas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation> Sveiki atvykę į</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Susieti šį įrenginį su paskyra</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Kaip pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Susikurkite savo profilį</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Įveskite savo visą vardą:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Susikurkite savo paskyrą</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Susikurkite savo profilį</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Įveskite savo visą vardą:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Susikurkite savo paskyrą</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registruoti viešąjį naudotojo vardą (eksperimentinis)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Pasirinkite savo naudotojo vardą</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Ieškoma...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Įveskite savo pin</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Patvirtinkite slaptažodį</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Ankstesnis</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Kitas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Jūsų paskyra turi būti perkelta. Įveskite savo slaptažodį.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Naudotojo vardas neprieinamas.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Naudotojo vardas yra prieinamas.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Naudotojo vardas yra neteisingas.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Tinklo klaida.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Atverti failą</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index 03cc3c9..76a1cfa 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Tambahkan sebagai kenalan</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Salin nombor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Tetapan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Tentang</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Sambungkan perangkat ini dengan akaun</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Kara laluan</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Sahkan kata laluan</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 5455eb2..4d5cc33 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Søk etter kontakttekst -inndata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Vis QR-kode for ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Del ring ID -knapp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklikk for å kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Feil ved generering av QR-kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Tilbake til hjemmeside -knapp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Legg til kontakter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Ønsker å snakke med deg!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Svar innkommende anrop -knapp </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorer innkommende anrop -knapp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Svar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Avbryt utgående anrop</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Fjern kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopier nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Melding ankommer fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Innkommende anrop fra %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Fotoboksvisning</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Ta bilde</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importer bilde</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importer</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Velg fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Velg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Del hele skjermen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Del skjermområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation>Dialogvindu for kontoopprettelsesveiviser</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Velkomstetikett</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Velkomstlogo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Lenk enhet -knapp</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Trykknapp for start av enhetslinking -utløser</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Lenk denne enheten til en konto</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Velg lenkemetode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Lenk konto til enhet fra nettverket</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Lenk konto fra DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Lenk fra eksportert kontoarkivfil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Lenk konto fra fil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Hvordan legge til en enhet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Velg fil å importere</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Kontoarkiveringssti:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Kontoarkiveringssti-velger</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Arkivpassord:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Arkivpassord-inndata</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Opprett din profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Fotoboks-miniprogram</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Avatarvisning</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Skriv inn hele navnet ditt:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Redigering av fullt navn</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Tekstoppføring for fullt navn -inndata</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Opprett din konto</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Velg fil å importere</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Kontoarkiveringssti:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Kontoarkiveringssti-velger</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Arkivpassord:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Arkivpassord-inndata</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Opprett din profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Fotoboks-miniprogram</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Avatarvisning</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Skriv inn hele navnet ditt:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Redigering av fullt navn</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Tekstoppføring for fullt navn -inndata</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Opprett din konto</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Offentlig brukernavn -avkryssningsboks</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Avkryssningsboks som velger hvorvidt en bruker ønsker et offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrer offentlig brukernavn (eksperimentelt)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Redigering av offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Velg ditt brukernavn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Verifiseringsstatus for offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Søker…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>PIN-redigering</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Enhetslenking for PIN-tekst -oppføring</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Skriv inn din PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Passordstekstinndata</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Passordteksinnskriving</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Passordsbekreftelsestekst-inndata</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Bekreft passord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Forrige side -knapp</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>trykkbar knapp for å nå forrige side av veivisning</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Forrige</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Neste side -knapp</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Trykk på knappen for å komme til neste side i veivisningen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Neste</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Kontoen din må flyttes. Skriv inn passordet ditt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Importerer kontoarkiv…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Legg til enhet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Brukernavn ikke tilgjengelig.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Brukernavnet er tilgjengelig.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Ugyldig brukernavn.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Nettverksfeil.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index 258922d..c8748f5 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Tekstinvoer contact zoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Toon QR-code voor Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Knop Ring-ID delen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklik om te kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Fout bij het aanmaken van QR-code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Knop terug naar startpagina</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Aan contacten toevoegen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Wil met je praten!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Knop inkomende oproep beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Knop inkomende oproep negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Uitgaande oproep annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Gesprek wissen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Contact verwijderen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Contact blokkeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Inkomend bericht van %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Fotoautomaatweergave</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Foto nemen</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>of</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Foto importeren</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importeren</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Scherm delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Schermgebied delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Bestand delen</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation>Dialoogvenster voor aanmaken van account</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Welkomstlabel</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Welkomstlogo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Knop apparaat koppelen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Trekker voor koppelen van apparaat na druk op knop</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Dit apparaat aan een account koppelen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Kies een koppelmethode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Account koppelen aan apparaat van het netwerk</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Account koppelen van DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Koppelen van geëxporteerd accountarchiefbestand</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Account koppelen van bestand</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Hoe voeg ik een apparaat toe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Kies een bestand om te importeren</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Accountarchiefpad:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Selectie accountarchiefpad</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Archiefwachtwoord:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Archiefwachtwoordinvoer</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Maak je profiel aan</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Fotoautomaatwidget</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Avatarweergave</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Voer je volledige naam in:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Bewerken volledige naam</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Tekstinvoer voor volledige naam</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Maak je account aan</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Kies een bestand om te importeren</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Accountarchiefpad:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Selectie accountarchiefpad</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Archiefwachtwoord:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Archiefwachtwoordinvoer</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Maak je profiel aan</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Fotoautomaatwidget</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Avatarweergave</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Voer je volledige naam in:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Bewerken volledige naam</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Tekstinvoer voor volledige naam</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Maak je account aan</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Selectievakje openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Selectievakje om te kiezen of de gebruiker een openbare gebruikersnaam wil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registreer een openbare gebruikersnaam (experimenteel)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Bewerken openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Kies je gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Status bevestiging openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Zoeken…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Bewerken pincode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Tekstinvoer pincode koppelen apparaat</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Voer je pincode in</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Wachtwoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Wachtwoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Wachtwoordbevestigingstekstinvoer</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Knop vorige pagina</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>druk op de knop om naar de vorige pagina van de assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Vorige</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Knop volgende pagina</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Druk op de knop om naar de volgende pagina van de assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Volgende</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Je account moet gemigreerd worden. Voer je wachtwoord in.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Accountarchief importeren…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Een apparaat toevoegen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Gebruikersnaam is niet beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Gebruikersnaam is beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Gebruikersnaam is ongeldig.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Netwerkfout.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index 6ea6e81..121b0e8 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Toon gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Tekstinvoer contact zoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Toon QR-code voor Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Knop Ring-ID delen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklik voor te kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Fout bij aanmaken van QR-code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Knop terug naar startpagina</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Aan contacten toevoegen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Toon uitgenodigden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Uitgenodigden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Wilt met u spreken!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Knop inkomende oproep beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Knop inkomende oproep negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Uitgaande oproep annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Video-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Audio-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Wis het gesprek</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Account verwijderen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Blokkeer contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Inkomend bericht van %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Fotoautomaatweergave</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Foto trekken</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>of</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Foto importeren</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importeren</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Kiesd een bestand</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Kies een bestand</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Scherm delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Schermgebied delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Bestand delen</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation>Dialoogvenster voor aanmaken van account</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Welkomstlabel</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Welkomstlogo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Knop apparaat koppelen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Trekker voor koppelen van apparaat na druk op knop</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Dit apparaat aan nen account koppelen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Kiesd een koppelingsmethode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Account koppelen aan apparaat van het netwerk</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Account koppelen van DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Koppelen van geëxporteerd accountarchiefbestand</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Account koppelen van bestand</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Hoe voeg ik een apparaat toe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Kiesd een bestand voor t’importeren</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Accountarchiefpad:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Selectie accountarchiefpad</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Archiefpaswoord:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Archiefpaswoordinvoer</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Maakt uw profiel aan</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Fotoautomaatwidget</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Avatarweergave</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Voerd uwe volledige naam in:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Bewerken volledige naam</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Tekstinvoer voor volledige naam</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Maakt uwen account aan</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Kiesd een bestand voor t’importeren</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Accountarchiefpad:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Selectie accountarchiefpad</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Archiefpaswoord:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Archiefpaswoordinvoer</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Maakt uw profiel aan</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Fotoautomaatwidget</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Avatarweergave</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Voerd uwe volledige naam in:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Bewerken volledige naam</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Tekstinvoer voor volledige naam</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Maakt uwen account aan</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Selectievakske openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Selectievakske voor te kiezen of da’ de gebruiker nen openbare gebruikersnaam wild</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registreerd nen openbare gebruikersnaam (experimenteel):</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Bewerken openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Kiesd uwe gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Status bevestiging openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Zoeken…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Bewerken pincode</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Tekstinvoer pincode koppelen apparaat</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Voerd uw pincode in</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Paswoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Paswoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Paswoord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Paswoordbevestigingstekstinvoer</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Bevestigd paswoord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Knop vorige pagina</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>drukt op de knop voor naar de vorige pagina van den assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Vorige</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Knop volgende pagina</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Drukt op de knop voor naar de volgende pagina van den assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Volgende</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Uwen account moe worden gemigreerd. Voerd uw paswoord in.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Accountarchief importeren…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Een apparaat toevoegen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Gebruikersnaam is nie beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Gebruikersnaam is beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Gebruikersnaam is ongeldig.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Netwerkfout.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index 6485214..a5efa3a 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Voeg toe aan contacten</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopieër nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 76c3dca..f1cfa86 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished">ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index c171fdc..b2ca0b2 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Rozmowy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Dodaj do kontaków</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Chce z tobą rozmawiać!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Odbierz</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Usuń kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Blokuj kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Skopiuj numer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Przychodząca wiadomość od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Połączenie przychodzące od %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>O</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Zrób zdjęcie</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>albo</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importuj</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Pliki (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Pliki (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Podziel się obszarem ekranu</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Podziel się obszar ekranu</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Podziel się plikiem</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Połącz to urządzenie z kontem</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Stwórz swój profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Stwórz konto</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Stwórz swój profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Stwórz konto</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Zarejestruj publiczną nazwę użytkownika (eksperymentalne)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Wybierz swoją nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Szukam...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Pole potwierdzenia hasła</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Poprzednie</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Następne</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index 4a0aee2..56ff5a6 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -688,6 +688,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -726,32 +734,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -759,150 +767,150 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -966,17 +974,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -997,42 +1005,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,12 +1028,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,17 +1137,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,147 +1496,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1658,170 +1570,246 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index daccbd4..3eac0a3 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -5,53 +5,54 @@
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Sobre</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>about button</source>
-        <translation type="unfinished"/>
+        <translation>botão sobre</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="478"/>
         <source>credits button</source>
-        <translation type="unfinished"/>
+        <translation>botão créditos</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
-        <translation type="unfinished"/>
+        <translation>Créditos</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="547"/>
         <source>Live Free or Die</source>
-        <translation type="unfinished"/>
+        <translation>Viva Livre ou Morra</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Jami.
 Jami is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>O cliente Microsoft Windows para o Jami
+O Jami é um programa de comunicação distribuído e seguro.</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>versão</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="39"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation>Criado por:</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="73"/>
         <source>Artwork by:</source>
-        <translation type="unfinished"/>
+        <translation>Arte por:</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="77"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation>Baseado no projeto SFLPhone</translation>
     </message>
 </context>
 <context>
@@ -84,24 +85,24 @@
     <message>
         <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
-        <translation>Nome do host</translation>
+        <translation>Servidor</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="350"/>
         <source>Public registered username</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador público registado</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
         <source>Username</source>
-        <translation>Usuário</translation>
+        <translation>Nome de utilizador</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="469"/>
         <location filename="../accountdetails.ui" line="1776"/>
         <source>Password</source>
-        <translation>Senha</translation>
+        <translation>Palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="515"/>
@@ -116,157 +117,157 @@
     <message>
         <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
-        <translation>Chamadas respondias automaticamente</translation>
+        <translation>Atender chamadas automaticamente</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
-        <translation>UPnP habilitado</translation>
+        <translation>UPnP ativado</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="832"/>
         <source>Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Configurações da Conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
+        <translation>Aceitar Chamada de Desconhecido</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="895"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation>Aceitar Chamada de Contacto</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="880"/>
         <source>Allow Call From History</source>
-        <translation type="unfinished"/>
+        <translation>Aceitar Chamada de Histórico</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="69"/>
         <source>General account info configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuração das informações gerais da conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="169"/>
         <source>Displayed name</source>
-        <translation type="unfinished"/>
+        <translation>Nome mostrado</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="191"/>
         <source>Displayed alias input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de apelido em exibição</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="302"/>
         <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
+        <translation>Endereço do servidor para SIP ou inicialização DHT</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador público</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de registar nome de utilizador na cadeia de blocos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
         <source>Register on blockchain</source>
-        <translation type="unfinished"/>
+        <translation>Registar na cadeia de blocos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
-        <translation type="unfinished"/>
+        <translation>URL do serviço de nomes</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="411"/>
         <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de URL do serviço de nomes</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="448"/>
         <source>SIP username input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de nome de utilizador SIP</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="491"/>
         <source>SIP password input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de palavra-chave SIP</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="537"/>
         <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de URL do proxy SIP</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="580"/>
         <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
+        <translation>Número de correio de voz SIP</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="592"/>
         <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto &quot;Atender chamadas automaticamente&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="613"/>
         <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto &quot;UPnP ativado&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="632"/>
         <source>Old password input line</source>
-        <translation type="unfinished"/>
+        <translation>Linha de entrada da palavra-chave antiga</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="641"/>
         <source>Input old password</source>
-        <translation type="unfinished"/>
+        <translation>Introduza a palavra-chave antiga</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="656"/>
         <source>Old Password</source>
-        <translation type="unfinished"/>
+        <translation>Palavra-chave Antiga</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="669"/>
         <source>New password text input</source>
-        <translation type="unfinished"/>
+        <translation>Nova entrada de texto de palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="675"/>
         <source>Input new password</source>
-        <translation type="unfinished"/>
+        <translation>Insira a nova palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="692"/>
         <source>New password</source>
-        <translation>Nova password</translation>
+        <translation>Nova palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="705"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto para confirmação da palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="711"/>
         <source>Input confirmation </source>
-        <translation type="unfinished"/>
+        <translation>Confirmação de entrada</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="727"/>
         <source>New pass confirmation</source>
-        <translation type="unfinished"/>
+        <translation>Confirmação da nova palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="751"/>
         <source>Change password</source>
-        <translation>Alterar senha</translation>
+        <translation>Alterar palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="770"/>
@@ -276,37 +277,37 @@
     <message>
         <location filename="../accountdetails.ui" line="783"/>
         <source>Cancel password change button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de cancelar a alteração da palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="798"/>
         <source>Changing password ...</source>
-        <translation type="unfinished"/>
+        <translation>A alterar palavra-chave...</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto &quot;Aceitar Chamadas de Desconhecidos&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="874"/>
         <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto &quot;Aceitar Chamada do Histórico&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="892"/>
         <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de seleção &quot;Aceitar Chamadas de Contacto&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="931"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation>Seleção de Toque de Chamada</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="955"/>
         <source>Play ringtone button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de reproduzir toque de chamada</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
@@ -316,27 +317,27 @@
     <message>
         <location filename="../accountdetails.ui" line="971"/>
         <source>ringtone file selector</source>
-        <translation type="unfinished"/>
+        <translation>seletor de ficheiro do toque de chamada</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1021"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>Áudio/Vídeo</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1024"/>
         <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuração de preferências dos codecs de áudio/vídeo</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1240"/>
         <source>Audio codecs</source>
-        <translation>Codificadores de áudio</translation>
+        <translation>Codecs de áudio</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1270"/>
         <source>Video codecs</source>
-        <translation>Codificadores de vídeo</translation>
+        <translation>Codecs de vídeo</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1287"/>
@@ -346,7 +347,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1290"/>
         <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configurações avançadas da conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1336"/>
@@ -356,12 +357,12 @@
     <message>
         <location filename="../accountdetails.ui" line="1356"/>
         <source>Registration expire timeout (seconds):</source>
-        <translation>A sessão expira em (segundos):</translation>
+        <translation>Tempo de expiração de registo (segundos):</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1372"/>
         <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>Seletor de tempo limite de registo spinbox</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1397"/>
@@ -371,17 +372,17 @@
     <message>
         <location filename="../accountdetails.ui" line="1418"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation>Porta Local:</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1436"/>
         <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>seletor de porta local spinbox</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1522"/>
         <source>same as local radio button</source>
-        <translation type="unfinished"/>
+        <translation>o mesmo que o botão de opção local</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1528"/>
@@ -391,12 +392,12 @@
     <message>
         <location filename="../accountdetails.ui" line="1546"/>
         <source>personalise address and ports radio button</source>
-        <translation type="unfinished"/>
+        <translation>botão de opção para personalizar endereço e portas</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1552"/>
         <source>Set published address and port:</source>
-        <translation>Defina endereço e porta:</translation>
+        <translation>Definir endereço e portas publicadas:</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1578"/>
@@ -406,7 +407,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1597"/>
         <source>ip address text input</source>
-        <translation type="unfinished"/>
+        <translation>entrada de texto para endereço IP</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1612"/>
@@ -416,12 +417,12 @@
     <message>
         <location filename="../accountdetails.ui" line="1631"/>
         <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>caixa numérica de cimabaixo do seletor de portas</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1666"/>
         <source>use STUN checkbox</source>
-        <translation type="unfinished"/>
+        <translation>caixa de visto de &quot;usar STUN&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1672"/>
@@ -432,12 +433,12 @@
         <location filename="../accountdetails.ui" line="1688"/>
         <location filename="../accountdetails.ui" line="1735"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation>URL do servidor</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1710"/>
         <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
+        <translation>caixa de visto de &quot;usar TURN&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1716"/>
@@ -447,27 +448,27 @@
     <message>
         <location filename="../accountdetails.ui" line="1732"/>
         <source>TURN server URL input</source>
-        <translation type="unfinished"/>
+        <translation>Campo para URL do servidor TURN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1751"/>
         <source>TURN server username input</source>
-        <translation type="unfinished"/>
+        <translation>Campo para o nome de utilizador do servidor TURN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1770"/>
         <source>TURN server password input</source>
-        <translation type="unfinished"/>
+        <translation>Campo para a palavra-chave do servidor TURN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1792"/>
         <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
+        <translation>Campo para domínio do servidor TURN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1795"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation>Domínio</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1844"/>
@@ -477,41 +478,41 @@
     <message>
         <location filename="../accountdetails.ui" line="1872"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Estas configurações serão usadas durante o estabelecimento de sessão via SDP, caso as configurações de roteamento não permitam acesso ao servidor ou a um peer</translation>
+        <translation>Estas configurações serão apenas utilizadas durante uma negociação de sessão SDP, caso o ICE não seja suportado pelo servidor ou membro.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1914"/>
         <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>Intervalo de portas RTP de áudio</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1944"/>
         <location filename="../accountdetails.ui" line="2084"/>
         <source>Min</source>
-        <translation>Min</translation>
+        <translation>Mín</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1960"/>
         <location filename="../accountdetails.ui" line="2100"/>
         <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
+        <translation>Seletor do intervalo de portas RTP áudio de limites baixos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1978"/>
         <location filename="../accountdetails.ui" line="2118"/>
         <source>Max</source>
-        <translation>Max</translation>
+        <translation>Máx</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1994"/>
         <location filename="../accountdetails.ui" line="2134"/>
         <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
+        <translation>Seletor do intervalo de portas RTP áudio de limites altos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2054"/>
         <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>Intervalo de portas RTP de vídeo</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2186"/>
@@ -521,42 +522,42 @@
     <message>
         <location filename="../accountdetails.ui" line="2189"/>
         <source>Account security configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuração da segurança da conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2276"/>
         <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
+        <translation>Seletor do certificado de autoridade</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2313"/>
         <source>User certificate selector</source>
-        <translation type="unfinished"/>
+        <translation>Seletor de certificado do utilizador</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2371"/>
         <source>private key password input</source>
-        <translation type="unfinished"/>
+        <translation>entrada de palavra-chave da chave privada</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2393"/>
         <source>User private key selector</source>
-        <translation type="unfinished"/>
+        <translation>Seletor de chave privada do utilizador</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2417"/>
         <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto para criptografar fluxo de media (SRTP)</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2420"/>
         <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
+        <translation>Encriptação do Fluxo de Média (SRTP)</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2432"/>
         <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto para usar cifras padrão</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2488"/>
@@ -566,12 +567,12 @@
     <message>
         <location filename="../accountdetails.ui" line="2491"/>
         <source>Account devices management</source>
-        <translation type="unfinished"/>
+        <translation>Gestão de dispositivos de conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2535"/>
         <source>Add device button</source>
-        <translation type="unfinished"/>
+        <translation>Botão &quot;adicionar dispositivo&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2538"/>
@@ -586,17 +587,17 @@
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de texto da palavra-chave</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2584"/>
         <source>Password (required)</source>
-        <translation type="unfinished"/>
+        <translation>Palavra-chave (necessária)</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2612"/>
         <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
+        <translation>Cancelar a exportação da conta para o botão de associação</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="786"/>
@@ -607,12 +608,12 @@
     <message>
         <location filename="../accountdetails.ui" line="2565"/>
         <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
+        <translation>Para adicionar um novo dispositivo à sua conta Jami, deve exportar sua conta na rede. Isso irá gerar um PIN que deve ser introduzido no seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2641"/>
         <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
+        <translation>Valida a exportação via DHT para o botão de associação do dispositivo</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -622,7 +623,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2709"/>
         <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
+        <translation>PIN gerado para associar</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2712"/>
@@ -632,12 +633,12 @@
     <message>
         <location filename="../accountdetails.ui" line="2722"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
+        <translation>Este PIN deve ser inserido no seu novo dispositivo nos próximos 5 minutos. Pode ter que gerar um novo a qualquer momento.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2741"/>
         <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
+        <translation>Botão &quot;aceitar a geração de PIN e sair&quot;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2744"/>
@@ -647,12 +648,12 @@
     <message>
         <location filename="../accountdetails.ui" line="2769"/>
         <source>Banned Contacts</source>
-        <translation type="unfinished"/>
+        <translation>Contactos Banidos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2772"/>
         <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
+        <translation>Aba de gestão de contactos banidos da conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1495"/>
@@ -662,12 +663,12 @@
     <message>
         <location filename="../accountdetails.ui" line="2254"/>
         <source>CA certificate</source>
-        <translation>Certificado CA</translation>
+        <translation>Certificado de CA</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2294"/>
         <source>User certificate</source>
-        <translation>Certificado do usuário</translation>
+        <translation>Certificado de utilizador</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2331"/>
@@ -677,12 +678,20 @@
     <message>
         <location filename="../accountdetails.ui" line="2346"/>
         <source>Private key password</source>
-        <translation>Senha da chave privada</translation>
+        <translation>Palavra-chave  de chave provada</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2435"/>
         <source>Use default ciphers</source>
-        <translation>Use cifras padrão</translation>
+        <translation>Utilizar cifras padrão</translation>
+    </message>
+</context>
+<context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -690,7 +699,7 @@
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formulário</translation>
     </message>
 </context>
 <context>
@@ -698,211 +707,214 @@
     <message>
         <location filename="../bannedcontactswidget.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="41"/>
         <source>Banned contacts list</source>
-        <translation type="unfinished"/>
+        <translation>Lista de contactos banidos</translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
-        <translation type="unfinished"/>
+        <translation>ID Banido</translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="101"/>
         <source>Deban contact button</source>
-        <translation type="unfinished"/>
+        <translation>Botão &quot;desbanir contacto&quot;</translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
-        <translation type="unfinished"/>
+        <translation>Desbanir e adicionar à lista de contactos</translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
-        <translation type="unfinished"/>
+        <translation>Ver conversações</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de texto para pesquisa de contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
-        <translation type="unfinished"/>
+        <translation>Pesquisar contactos ou inserir o ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>O Jami é um software livre para comunicação universal que respeita as liberdades e a privacidade dos seus utilizadores.</translation>
+        <translation>O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
                                       </source>
-        <translation type="unfinished"/>
+        <translation>
+ Este é o seu ID.
+Copie-o e partilhe-o com os seus amigos!
+                                      </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar código QR do seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para partilhar o seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
-        <translation type="unfinished"/>
+        <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao gerar o Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
-        <translation type="unfinished"/>
+        <translation>melhor nome</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
-        <translation type="unfinished"/>
+        <translation>melhor Id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para voltar à página inicial</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
-        <translation type="unfinished"/>
+        <translation>Convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation>Quer conversar consigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para atender chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para ignorar chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
-        <translation type="unfinished"/>
+        <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
-        <translation type="unfinished"/>
+        <translation>Começar chamada de vídeo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
-        <translation type="unfinished"/>
+        <translation>Começar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
-        <translation type="unfinished"/>
+        <translation>Limpar conversação</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
-        <translation type="unfinished"/>
+        <translation>Remover contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
-        <translation type="unfinished"/>
+        <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
-        <translation type="unfinished"/>
+        <translation>Contacte-me no Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
-        <translation type="unfinished"/>
+        <translation>O meu ID é:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>A receber mensagem de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>A receber chamada de %1</translation>
     </message>
 </context>
 <context>
@@ -910,22 +922,22 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="35"/>
         <source>Account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Eliminação de conta</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="55"/>
         <source>Do you really want to delete the following account?</source>
-        <translation type="unfinished"/>
+        <translation>Tem certeza que quer eliminar a seguinte conta?</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="135"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
-        <translation type="unfinished"/>
+        <translation>Se esta conta não foi exportada ou adicionada a outro dispositivo, ela será perdida.</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="212"/>
         <source>Permanently delete account</source>
-        <translation type="unfinished"/>
+        <translation>Eliminar conta permanentemente</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
@@ -935,7 +947,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
         <source>Cancel account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Cancelar eliminação da conta</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="256"/>
@@ -948,40 +960,40 @@
     <message>
         <location filename="../invitebuttonswidget.ui" line="72"/>
         <source>Accept invite</source>
-        <translation type="unfinished"/>
+        <translation>Aceitar convite</translation>
     </message>
     <message>
         <location filename="../invitebuttonswidget.ui" line="104"/>
         <source>Ignore invite</source>
-        <translation type="unfinished"/>
+        <translation>Ignorar convite</translation>
     </message>
     <message>
         <location filename="../invitebuttonswidget.ui" line="136"/>
         <source>Block person</source>
-        <translation type="unfinished"/>
+        <translation>Bloquear pessoa</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Sobre</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -989,63 +1001,43 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation>Foto instantânea</translation>
     </message>
 </context>
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar foto instantânea</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Tirar fotografia</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros (*)</translation>
     </message>
 </context>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros (*)</translation>
     </message>
 </context>
 <context>
@@ -1053,29 +1045,29 @@
     <message>
         <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation>Cliente de e-mail padrão não encontrado</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="68"/>
         <source>Edit Device Name</source>
-        <translation type="unfinished"/>
+        <translation>Editar Nome do Dispositivo</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="74"/>
         <source>Unlink Device From Account</source>
-        <translation type="unfinished"/>
+        <translation>Desassociar Dispositivo da Conta</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="90"/>
         <source>Unblock Contact</source>
-        <translation type="unfinished"/>
+        <translation>Desbloquear Contacto</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
         <source>Jami account</source>
         <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
+        <translation>Conta Jami</translation>
     </message>
 </context>
 <context>
@@ -1083,7 +1075,7 @@
     <message>
         <location filename="../ringbutton.ui" line="140"/>
         <source>Select folder</source>
-        <translation type="unfinished"/>
+        <translation>Select folder</translation>
     </message>
 </context>
 <context>
@@ -1091,52 +1083,52 @@
     <message>
         <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>Chamada em Espera</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="89"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation>Esperar / Retomar</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="124"/>
         <source>Chat</source>
-        <translation>Bate-papo</translation>
+        <translation>Conversa</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation>Desativar Microfone</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
-        <translation type="unfinished"/>
+        <translation>Gravar chamada</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>Rótulo do nome</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation>Tempo decorrido</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation>00:00</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuração</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="57"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation>Desligar</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="203"/>
@@ -1147,19 +1139,19 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
-        <translation type="unfinished"/>
+        <translation>Partilhar ecrã inteiro</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
-        <translation>Compartilhar tela</translation>
+        <translation>Partilhar área do ecrã</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
-        <translation>Anexar arquivo</translation>
+        <translation>Partilhar ficheiro</translation>
     </message>
 </context>
 <context>
@@ -1167,67 +1159,67 @@
     <message>
         <location filename="../wizarddialog.cpp" line="71"/>
         <source>Your account needs to be migrated. Enter your password.</source>
-        <translation type="unfinished"/>
+        <translation>A sua conta tem de ser migrada. Introduza a sua palavra-chave.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A migrar a sua conta Jami...</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
         <source>Importing account archive...</source>
-        <translation type="unfinished"/>
+        <translation>A importar ficheiro da conta...</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="174"/>
         <source>Add a device</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar dispositivo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="292"/>
         <source>Username not available.</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador não disponível.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="295"/>
         <source>Username is available.</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador está disponível.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="298"/>
         <source>Username is invalid.</source>
-        <translation type="unfinished"/>
+        <translation>O nome de utilizador não é válido.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="301"/>
         <source>Network error.</source>
-        <translation type="unfinished"/>
+        <translation>Erro na rede.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="349"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>Abrir Ficheiro</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros de arquivo Jami (*.gz);; Todos os ficheiros (*)</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
-        <translation>Ligar este dispositivo a uma conta</translation>
+        <translation>Associar este dispositivo a uma conta</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="322"/>
         <source>How to add a device</source>
-        <translation type="unfinished"/>
+        <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
-        <translation type="unfinished"/>
+        <translation>Bem-vindo(a) ao</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="450"/>
@@ -1237,7 +1229,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="564"/>
         <source>Enter your full name:</source>
-        <translation type="unfinished"/>
+        <translation>Introduza o seu nome completo:</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="629"/>
@@ -1248,7 +1240,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="730"/>
         <source>Choose your username</source>
-        <translation type="unfinished"/>
+        <translation>Escolha o seu nome de utilizador</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="749"/>
@@ -1259,72 +1251,72 @@
     <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de Diálogo do Assistente</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="36"/>
         <source>Account creation wizard dialog</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de diálogo do assistente de criação de conta</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="72"/>
         <source>Welcome Label</source>
-        <translation type="unfinished"/>
+        <translation>Rótulo de Boas-Vindas</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="107"/>
         <source>Welcome Logo</source>
-        <translation type="unfinished"/>
+        <translation>Logótipo de Boas-Vindas</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
         <source>Create Jami account button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para criar conta Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
         <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Botão para acionar a criação da conta do Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Jami account</source>
-        <translation type="unfinished"/>
+        <translation>Criar uma conta Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
         <source>Link device button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="170"/>
         <source>Push button for device linkage start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="205"/>
         <source>Select link method</source>
-        <translation type="unfinished"/>
+        <translation>Método de seleção da associação</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="254"/>
         <source>Link account to device from the network</source>
-        <translation type="unfinished"/>
+        <translation>Associar dispositivo a esta conta a partir da rede</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="257"/>
         <source>Link account from DHT</source>
-        <translation type="unfinished"/>
+        <translation>Associar a uma conta do DHT</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="270"/>
         <source>Link from exported account archive file</source>
-        <translation type="unfinished"/>
+        <translation>Link do ficheiro da conta exportada</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="273"/>
         <source>Link account from file</source>
-        <translation type="unfinished"/>
+        <translation>Associar conta a partir do ficheiro</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="329"/>
@@ -1338,139 +1330,148 @@
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para associar este dispositivo a outra conta, primeiro &lt;/span&gt;tem de obter um código PIN.&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Para gerar um código PIN,&lt;/span&gt;&lt;/span&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá a &lt;span style=&quot; font-weight:600;&quot;&gt;Configurações da gestão da conta&lt;/span&gt; de um dispositivo anterior&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Escolha a opção &lt;span style=&quot; font-weight:600;&quot;&gt;Conta Jami&lt;/span&gt; que quer usar.&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Aceda à &lt;span style=&quot; font-weight:600;&quot;&gt;aba de dispositivos&lt;/span&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecione &lt;span style=&quot; font-weight:600;&quot;&gt;Adicionar um dispositivo&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
-        <translation type="unfinished"/>
+        <translation>Selecione o ficheiro a importar</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="382"/>
         <source>Account archive path:</source>
-        <translation type="unfinished"/>
+        <translation>Diretório do ficheiro da conta:</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="389"/>
         <source>Account archive path selector</source>
-        <translation type="unfinished"/>
+        <translation>Seletor do diretório do ficheiro da conta</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="406"/>
         <source>Archive password:</source>
-        <translation type="unfinished"/>
+        <translation>Palavra-chave do ficheiro:</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="413"/>
         <source>Archive passord input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de palavra-chave do ficheiro</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="482"/>
         <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
+        <translation>Assistente de Foto Instantânea</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="509"/>
         <source>Avatar display</source>
-        <translation type="unfinished"/>
+        <translation>Visualização do avatar</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="588"/>
         <source>Full name edit</source>
-        <translation type="unfinished"/>
+        <translation>Editar nome completo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="594"/>
         <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto para inserir o nome completo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="670"/>
         <source>Register your username on the network. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <translation>Registe o seu nome de utilizador na rede. Isto irá reservar o nome de utilizador para que apenas você o possa utilizar. Os seus amigos serão capazes de contactá-lo com seu nome de utilizador em vez do seu ID</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto para o nome público de utilizador</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="676"/>
         <source>Checkbox selecting if the user wants a public username</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto para indicar se o utilizador quer um nome público de utilizador</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="679"/>
         <source>Register public username (experimental)</source>
-        <translation type="unfinished"/>
+        <translation>Registar nome público de utilizador (experimental)</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="724"/>
         <source>Public username edit</source>
-        <translation type="unfinished"/>
+        <translation>Editar nome público de utilizador</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="746"/>
         <source>Public username validation status</source>
-        <translation type="unfinished"/>
+        <translation>Estado de validação do nome público de utilizador</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="778"/>
         <source>PIN edit</source>
-        <translation type="unfinished"/>
+        <translation>Editar PIN</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="784"/>
         <source>Device linking PIN text entry</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto para o PIN de associação de dispositivo</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="787"/>
         <source>Enter your pin</source>
-        <translation type="unfinished"/>
+        <translation>Introduza o seu PIN</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="814"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de texto da palavra-chave</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="820"/>
         <source>Password text entry</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto da palavra-chave</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="826"/>
         <source>Password</source>
-        <translation>Senha</translation>
+        <translation>Palavra-chave</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="853"/>
         <location filename="../wizarddialog.ui" line="859"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto para confirmação da palavra-chave</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="865"/>
         <source>Confirm password</source>
-        <translation>Confirmar senha</translation>
+        <translation>Confirmar palavra-chave</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
         <source>Previous page button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de página anterior</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="975"/>
         <source>push button to access previous page of wizard</source>
-        <translation type="unfinished"/>
+        <translation>Botão de pressionar para aceder à página anterior do assistente</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="978"/>
@@ -1480,12 +1481,12 @@
     <message>
         <location filename="../wizarddialog.ui" line="1010"/>
         <source>Next page Button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de página seguinte</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="1016"/>
         <source>Push button to access next page of wizard</source>
-        <translation type="unfinished"/>
+        <translation>Botão de pressionar para aceder à página seguinte do assistente</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="1019"/>
@@ -1498,155 +1499,79 @@
     <message>
         <location filename="../wizardwidget.ui" line="33"/>
         <source>Wizard Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de Diálogo do Assistente</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="36"/>
         <source>Account creation wizard dialog</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de diálogo do assistente de criação de conta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
-        <translation type="unfinished"/>
+        <translation>Rótulo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
-        <translation type="unfinished"/>
+        <translation>Bem-vindo(a) ao</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
-        <translation type="unfinished"/>
+        <translation>Logótipo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
-        <translation>Ligar este dispositivo a uma conta</translation>
+        <translation>Associar este dispositivo a uma conta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
-        <translation type="unfinished"/>
+        <translation>Método de seleção da associação</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
-        <translation type="unfinished"/>
+        <translation>Associar dispositivo a esta conta a partir da rede</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
-        <translation type="unfinished"/>
+        <translation>Associar a uma conta do DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
-        <translation type="unfinished"/>
+        <translation>Link do ficheiro da conta exportada</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
-        <translation type="unfinished"/>
+        <translation>Associar conta a partir do ficheiro</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
-        <translation type="unfinished"/>
+        <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Criar o seu perfil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Criar a sua conta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,172 +1581,248 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Selecione o ficheiro a importar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Diretório do ficheiro da conta:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Seletor do diretório do ficheiro da conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Palavra-chave do ficheiro:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Entrada de palavra-chave do ficheiro</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Criar o seu perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Assistente de Foto Instantânea</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Visualização do avatar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Introduza o seu nome completo:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Editar nome completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Campo de texto para inserir o nome completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Criar a sua conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation>Botão para criar conta Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation>Botão para acionar a criação da conta do Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation>Criar uma conta Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <translation>Registe o seu nome de utilizador no Jami. Isto irá reservar o nome de utilizador para que apenas você o possa utilizar. Os seus amigos serão capazes de contactá-lo com seu nome de utilizador em vez do seu ID</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto para o nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
-        <translation type="unfinished"/>
+        <translation>Caixa de visto para indicar se o utilizador quer um nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
-        <translation type="unfinished"/>
+        <translation>Registar nome público de utilizador (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
-        <translation type="unfinished"/>
+        <translation>Editar nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
-        <translation type="unfinished"/>
+        <translation>Escolha o seu nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
-        <translation type="unfinished"/>
+        <translation>Estado de validação do nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>A pesquisar...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
-        <translation type="unfinished"/>
+        <translation>Editar PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="787"/>
-        <source>Enter your pin</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto para o PIN de associação de dispositivo</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="814"/>
+        <source>Enter your pin</source>
+        <translation>Introduza o seu PIN</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation>Entrada de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="826"/>
-        <source>Password</source>
-        <translation>Senha</translation>
+        <translation>Campo de texto da palavra-chave</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <source>Password</source>
+        <translation>Palavra-chave</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation>Campo de texto para confirmação da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
-        <translation>Confirmar senha</translation>
+        <translation>Confirmar palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de página anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
-        <translation type="unfinished"/>
+        <translation>Botão de pressionar para aceder à página anterior do assistente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
-        <translation type="unfinished"/>
+        <translation>Botão de página seguinte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
-        <translation type="unfinished"/>
+        <translation>Botão de pressionar para aceder à página seguinte do assistente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
-        <translation type="unfinished"/>
+        <translation>A sua conta tem de ser migrada. Introduza a sua palavra-chave.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A migrar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
-        <translation type="unfinished"/>
+        <translation>A importar ficheiro da conta...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador não disponível.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador está disponível.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
-        <translation type="unfinished"/>
+        <translation>O nome de utilizador não é válido.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
-        <translation type="unfinished"/>
+        <translation>Erro na rede.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros de arquivo Jami (*.gz);; Todos os ficheiros (*)</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 9ee5619..ef0eb2b 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Mostrar conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para busca de contato </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar código QR do seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Botão para compartilhar o seu Id do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Botão para voltar à página inicial</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contatos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Mostrar convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Convida</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar com você!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Botão para atender chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Botão para ignorar chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Iniciar videochamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Iniciar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Eliminar a conversa</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Remover contato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Bloquear contato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Recebendo mensagem de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Recebendo chamada de %1</translation>
     </message>
@@ -964,24 +972,24 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Exibir foto instantânea</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Tirar foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importar foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Escolher Arquivo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Arquivos (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Escolher Arquivo</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Arquivos (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Compartilhar tela inteira</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Compartilhar área da tela</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Compartilhar arquivo</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation>Caixa de diálogo do assistente de criação de conta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Legenda de boas-vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Bem-vindo ao</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Logotipo de boas-vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Associar este dispositivo a uma conta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Método de seleção do link</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Associar dispositivo a esta conta a partir da rede</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Associar à uma conta do DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Link do arquivo da conta exportada</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Associar conta a partir do arquivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Selecione um arquivo para importar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Diretório do arquivo da conta:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Seletor do diretório do arquivo da conta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Senha do arquivo:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Entrada de senha de arquivo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Criar um Perfil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Assistente de foto instantânea</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Exibir avatar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Digite seu nome completo:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Editar nome completo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Campo de texto para inserir o nome completo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Criar uma conta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Selecione um arquivo para importar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Diretório do arquivo da conta:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Seletor do diretório do arquivo da conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Senha do arquivo:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Entrada de senha de arquivo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Criar um Perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Assistente de foto instantânea</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Exibir avatar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Digite seu nome completo:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Editar nome completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Campo de texto para inserir o nome completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Criar uma conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Caixa de seleção para nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Caixa de seleção para indicar se o usuário deseja um nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrar usuário público (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Editar nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Escolha seu nome de usuário</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Estado de validação do nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Editar PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Campo de texto para o PIN de associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Entre o seu PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Entrada de texto de senha</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Campo de texto da Senha</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Campo de texto para confirmação da Senha</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmar senha</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Botão da página anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>Pressione botão para acessar a página anterior do assistente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Botão da próxima página</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Pressione botão para acessar próxima página do assistente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Sua conta precisa ser migrada. Entre com sua senha.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Importando arquivo da conta...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Usuário não disponível.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Usuário disponível.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Usuário é inválido.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Erro na Rede.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index 63152a7..9339660 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -31,7 +31,8 @@
         <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Jami.
 Jami is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>O cliente Microsoft Windows para o Jami
+O Jami é um programa de comunicação distribuído e seguro.</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -89,7 +90,7 @@
     <message>
         <location filename="../accountdetails.ui" line="350"/>
         <source>Public registered username</source>
-        <translation type="unfinished"/>
+        <translation>Nome de utilizador público registado</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="426"/>
@@ -126,7 +127,7 @@
     <message>
         <location filename="../accountdetails.ui" line="832"/>
         <source>Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Configurações da Conta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
@@ -607,7 +608,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2565"/>
         <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
+        <translation>Para adicionar um novo dispositivo à sua conta Jami, deve exportar sua conta na rede. Isso irá gerar um PIN que deve ser introduzido no seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2641"/>
@@ -686,6 +687,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,183 +733,186 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Ver conversações</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para pesquisa de contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
-        <translation type="unfinished"/>
+        <translation>Pesquisar contactos ou inserir o ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
                                       </source>
-        <translation type="unfinished"/>
+        <translation>
+ Este é o seu ID.
+Copie-o e partilhe-o com os seus amigos!
+                                      </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar código QR do seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Botão para partilhar o seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation>melhor nome</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation>melhor Id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Botão para voltar à página inicial</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Mostrar convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar consigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Botão para atender chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Botão para ignorar chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Começar chamada de vídeo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Começar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Limpar conversação</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Remover contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
-        <translation type="unfinished"/>
+        <translation>Contacte-me no Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
-        <translation type="unfinished"/>
+        <translation>O meu ID é:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>A receber mensagem de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>A receber chamada de %1</translation>
     </message>
@@ -910,22 +922,22 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="35"/>
         <source>Account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Eliminação de conta</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="55"/>
         <source>Do you really want to delete the following account?</source>
-        <translation type="unfinished"/>
+        <translation>Tem certeza que quer eliminar a seguinte conta?</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="135"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
-        <translation type="unfinished"/>
+        <translation>Se esta conta não foi exportada ou adicionada a outro dispositivo, ela será perdida.</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="212"/>
         <source>Permanently delete account</source>
-        <translation type="unfinished"/>
+        <translation>Eliminar conta permanentemente</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
@@ -935,7 +947,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
         <source>Cancel account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Cancelar eliminação da conta</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="256"/>
@@ -964,24 +976,24 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1007,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Mostrar foto instantânea</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Tirar fotografia</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ou</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importar foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Ficheiros (*)</translation>
     </message>
@@ -1038,12 +1030,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Ficheiros (*)</translation>
     </message>
@@ -1058,24 +1050,24 @@
     <message>
         <location filename="../settingsitemwidget.cpp" line="68"/>
         <source>Edit Device Name</source>
-        <translation type="unfinished"/>
+        <translation>Editar Nome do Dispositivo</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="74"/>
         <source>Unlink Device From Account</source>
-        <translation type="unfinished"/>
+        <translation>Desassociar Dispositivo da Conta</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="90"/>
         <source>Unblock Contact</source>
-        <translation type="unfinished"/>
+        <translation>Desbloquear Contacto</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
         <source>Jami account</source>
         <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
+        <translation>Conta Jami</translation>
     </message>
 </context>
 <context>
@@ -1147,17 +1139,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Partilhar ecrã inteiro</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Partilhar área do ecrã</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Partilhar ficheiro</translation>
     </message>
@@ -1172,7 +1164,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A migrar a sua conta Jami...</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1212,7 +1204,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros de arquivo Jami (*.gz);; Todos os ficheiros (*)</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1279,17 +1271,17 @@
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
         <source>Create Jami account button</source>
-        <translation type="unfinished"/>
+        <translation>Botão para criar conta Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
         <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Botão para acionar a criação da conta do Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Jami account</source>
-        <translation type="unfinished"/>
+        <translation>Criar uma conta Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1338,7 +1330,16 @@
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para associar este dispositivo a outra conta, primeiro &lt;/span&gt;tem de obter um código PIN.&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Para gerar um código PIN,&lt;/span&gt;&lt;/span&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá a &lt;span style=&quot; font-weight:600;&quot;&gt;Configurações da gestão da conta&lt;/span&gt; de um dispositivo anterior&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Escolha a opção &lt;span style=&quot; font-weight:600;&quot;&gt;Conta Jami&lt;/span&gt; que quer usar.&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Aceda à &lt;span style=&quot; font-weight:600;&quot;&gt;aba de dispositivos&lt;/span&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecione &lt;span style=&quot; font-weight:600;&quot;&gt;Adicionar um dispositivo&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="357"/>
@@ -1388,7 +1389,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="670"/>
         <source>Register your username on the network. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <translation>Registe o seu nome de utilizador na rede. Isto irá reservar o nome de utilizador para que apenas você o possa utilizar. Os seus amigos serão capazes de contactá-lo com seu nome de utilizador em vez do seu ID</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="673"/>
@@ -1460,7 +1461,7 @@
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -1506,147 +1507,71 @@
         <translation>Caixa de diálogo do assistente de criação de conta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Rótulo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Bem-vindo(a) ao</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Logótipo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Associar este dispositivo a uma conta</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Método de seleção da associação</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Associar dispositivo a esta conta a partir da rede</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Associar a uma conta do DHT</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Link do ficheiro da conta exportada</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Associar conta a partir do ficheiro</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Selecione o ficheiro a importar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Diretório do ficheiro da conta:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Seletor do diretório do ficheiro da conta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Palavra-chave do ficheiro:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Entrada de palavra-chave do ficheiro</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Criar o seu perfil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Assistente de Foto Instantânea</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Visualização do avatar</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Introduza o seu nome completo:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Editar nome completo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Campo de texto para inserir o nome completo</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Criar a sua conta</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,172 +1581,248 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Selecione o ficheiro a importar</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Diretório do ficheiro da conta:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Seletor do diretório do ficheiro da conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Palavra-chave do ficheiro:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Entrada de palavra-chave do ficheiro</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Criar o seu perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Assistente de Foto Instantânea</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Visualização do avatar</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Introduza o seu nome completo:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Editar nome completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Campo de texto para inserir o nome completo</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Criar a sua conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation>Botão para criar conta Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation>Botão para acionar a criação da conta do Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation>Criar uma conta Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
+        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
+        <translation>Registe o seu nome de utilizador no Jami. Isto irá reservar o nome de utilizador para que apenas você o possa utilizar. Os seus amigos serão capazes de contactá-lo com seu nome de utilizador em vez do seu ID</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Caixa de visto para o nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Caixa de visto para indicar se o utilizador quer um nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registar nome público de utilizador (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Editar nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Escolha o seu nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Estado de validação do nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>A pesquisar...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Editar PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Campo de texto para o PIN de associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Introduza o seu PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Entrada de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Campo de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Campo de texto para confirmação da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmar palavra-chave</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Botão de página anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>Botão de pressionar para aceder à página anterior do assistente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Botão de página seguinte</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Botão de pressionar para aceder à página seguinte do assistente</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>A sua conta tem de ser migrada. Introduza a sua palavra-chave.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>A migrar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>A importar ficheiro da conta...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Nome de utilizador não disponível.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Nome de utilizador está disponível.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>O nome de utilizador não é válido.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Erro na rede.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros de arquivo Jami (*.gz);; Todos os ficheiros (*)</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index 6966902..f2e9b75 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Adaugă la contacte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Setari</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Confirmă parola</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index 80f1cee..9a15634 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Показать беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Разговоры</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Показать Ring ID QR код</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Двойной клик для копирования</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Ошибка при создании QR кода</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Кнопка возврата на главную страницу</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Добавить в контакты</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Показать приглашения</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Приглашения</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Кнопка ответа на входящий вызов </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Кнопка игнорирования входящего вызова</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Отменить исходящий вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Начать видеовызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Начать голосовой вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Очистить разговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Удалить контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Заблокировать контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Копировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Сообщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Звонок от %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Сфотографировать</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>или</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Импортировать фото</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Импорт</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Транслировать весь экран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Транслировать область экрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Поделиться файлом</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Добро пожаловать в</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Привязать это устройство к аккаунту</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Как добавить устройство</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Выберите файл для импорта</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Путь к архиву с аккаунтом:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Пароль архива:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Создайте свой профиль</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Введите ваше полное имя:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Создайте свой аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Выберите файл для импорта</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Путь к архиву с аккаунтом:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Пароль архива:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Создайте свой профиль</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Введите ваше полное имя:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Создайте свой аккаунт</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Зарегистрировать публичное имя (экспериментальная функция)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Выберите ваше имя пользователя</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Поиск…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Введите ваш PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Ввод текста пароля</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Ввод текста подтверждения пароля</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Подтверждение пароля</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>кнопка Предыдущая страница</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>нажмите кнопку для перехода к предыдущей странице Мастера</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Кнопка Следующая страница</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>Нажмите кнопку для перехода к следующей странице Мастера</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Импорт архива с аккаунтом…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Добавить устройство</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Имя пользователя недоступно.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Имя пользователя доступно.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Недопустимое имя пользователя.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Ошибка сети.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 4a5ade7..18eed5b 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Ответ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Скопировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Входящее сообщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Входящий вызов от %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>О продукте</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Фотографировать</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>или</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Импорт</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Выбрать файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Файлы(*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Выбрать файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Общий доступ к экрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Поделится файлом</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Выберите ваше имя пользователя</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Подтверждение пароля</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 9c084e7..0554bf4 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Odpoveď</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Nastavenie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>O programe</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Vyber súbor</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Súbory (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Vyber súbor</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Súbory (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Ďalej</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index 4dbd10b..93b746d 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Pogovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Kopiraj z dvojnim klikom</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Napaka med pripravo QR kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Dodaj v stike</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti s tabo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Odgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Odstrani stik</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopiraj številko</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Dohodno sporočilo od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Dohodni klic od %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Izhod</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>O Ring</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Naredi sliko</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ali</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Uvoz</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Izberi datoteko</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Izberi datoteko</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Deli celoten zaslon</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Deli območje zaslona</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Deli datoteko</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Dobrodošli v</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Poveži to napravo k računu</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Kako dodati napravo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Ustvari svoj profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Vpiši svoje polno ime:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Ustvari svoj račun</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Ustvari svoj profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Vpiši svoje polno ime:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Ustvari svoj račun</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Prijavi javno ime (eksperimentalno)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Izberi svoje uporabniško ime:</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Iščem...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Vpiši svoj PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Geslo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Potrdi geslo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Prejšni</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Naprej</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Dodaj napravo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Uporabniško ime ni na voljo.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Uporabniško ime je na voljo.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Uporabniško ime ni veljavno.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Napaka mreže.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Odpri datoteko</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index 377020f..7c5c98f 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -31,7 +31,8 @@
         <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Jami.
 Jami is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>Klienti Jami për Microsoft Windows.
+Jami është një software komunikimi të siguruar dhe të shpërndarë.</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -89,7 +90,7 @@
     <message>
         <location filename="../accountdetails.ui" line="350"/>
         <source>Public registered username</source>
-        <translation type="unfinished"/>
+        <translation>Emër përdoruesi regjistruar publikisht</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="426"/>
@@ -126,7 +127,7 @@
     <message>
         <location filename="../accountdetails.ui" line="832"/>
         <source>Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Rregullime Llogarie</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
@@ -462,7 +463,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1792"/>
         <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
+        <translation>Dhënie URL-je shërbyesi TURN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1795"/>
@@ -581,7 +582,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2644"/>
         <source>Export on the network</source>
-        <translation type="unfinished"/>
+        <translation>Eksportoje në rrjet</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -607,7 +608,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2565"/>
         <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
+        <translation>Që t’i shtoni llogarisë tuaj Jami një pajisje të re, eksportoni llogarinë tuaj në rrjet. Kjo do të prodhojë një PIN që duhet dhënë te pajisja juaj e re brenda 5 minutash nga çasti i prodhimit.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2641"/>
@@ -686,6 +687,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,183 +733,185 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>Shfaq biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>Dhënie teksti kërkimi kontakti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
-        <translation type="unfinished"/>
+        <translation>Kërkoni te kontaktet ose jepni ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
                                       </source>
-        <translation type="unfinished"/>
+        <translation>
+Kjo është ID-ja juaj.
+Kopjojeni dhe jepuani shokëve!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>Shfaq kod QR ID-je Ring-u</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>Buton Ndani ID Ringu Me të Tjerët</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dyklikojeni që të kopjohet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Gabim teksa prodhohej kodi QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>Buton Mbrapsht te faqja hyrëse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Shtoje te kontaktet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>Shfaq ftesa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>Ftesa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Dëshiron të bisedojë me ju!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>Buton Përgjigjuni thirrjes ardhëse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>Buton Shpërfille thirrjen ardhëse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Përgjigjuni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Shpërfille</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>Anuloje dërgimin e thirrjes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>Filloni thirrje video</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>Filloni thirrje audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Pastroje bisedën</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Hiqe kontaktin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Bllokojeni kontaktin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopjoje numrin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
-        <translation type="unfinished"/>
+        <translation>Lidhuni me mua në Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
-        <translation type="unfinished"/>
+        <translation>ID-ja ime është:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Mesazh ardhës nga %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Thirrje ardhur nga %1</translation>
     </message>
@@ -910,22 +921,22 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="35"/>
         <source>Account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Fshirje llogarie</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="55"/>
         <source>Do you really want to delete the following account?</source>
-        <translation type="unfinished"/>
+        <translation>Doni vërtet të fshihet llogaria vijuese?</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="135"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
-        <translation type="unfinished"/>
+        <translation>Nëse kjo llogari s’është eksportuar, ose shtuar te një tjetër pajisje, do të humbë në mënyrë të pakthyeshme.</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="212"/>
         <source>Permanently delete account</source>
-        <translation type="unfinished"/>
+        <translation>Fshije llogarinë përgjithmonë</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
@@ -935,7 +946,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
         <source>Cancel account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Anulo fshirje llogarie</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="256"/>
@@ -964,24 +975,24 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Rregullime</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Dalje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Mbi</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1006,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>Shfaqje kioske fotosh</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Bëni një foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>ose</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importoni foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importoje</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Zgjidhni Kartelë</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Kartela (*)</translation>
     </message>
@@ -1038,12 +1029,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Zgjidhni Kartelë</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Kartela (*)</translation>
     </message>
@@ -1058,24 +1049,24 @@
     <message>
         <location filename="../settingsitemwidget.cpp" line="68"/>
         <source>Edit Device Name</source>
-        <translation type="unfinished"/>
+        <translation>Përpunoni Emër Pajisjeje</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="74"/>
         <source>Unlink Device From Account</source>
-        <translation type="unfinished"/>
+        <translation>Hiqini Lidhjen Prej Llogarie Kësaj Pajisjeje</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="90"/>
         <source>Unblock Contact</source>
-        <translation type="unfinished"/>
+        <translation>Zhbllokoje Kontaktin</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
         <source>Jami account</source>
         <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
+        <translation>Llogari Jami</translation>
     </message>
 </context>
 <context>
@@ -1147,17 +1138,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Nda krejt ekranin</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Ndani me të tjerët zonën e ekranit</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Ndani kartelë me të tjerë</translation>
     </message>
@@ -1172,7 +1163,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Po migrohet llogaria juaj Jami…</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1212,7 +1203,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Kartela arkiv Jami (*.gz);; Krejt kartelat (*)</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1279,17 +1270,17 @@
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
         <source>Create Jami account button</source>
-        <translation type="unfinished"/>
+        <translation>Buton Krijoni llogari Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
         <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Buton për të shkaktuar fillimin e krijimit të llogarisë Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Jami account</source>
-        <translation type="unfinished"/>
+        <translation>Krijoni një llogari Jami</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1338,7 +1329,16 @@
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Për të lidhur këtë pajisje me një llogari tjetër, së pari &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;lypset të merrni një kod PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;. Për të prodhuar kodin PIN:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shkoni te &lt;span style=&quot; font-weight:600;&quot;&gt;rregullimet Administrim llogarie&lt;/span&gt; të pajisjes së mëparshme&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Zgjidhni &lt;span style=&quot; font-weight:600;&quot;&gt;llogarinë Jami&lt;/span&gt; që doni të përdoret&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shkoni te skeda &lt;span style=&quot; font-weight:600;&quot;&gt;Pajisje&lt;/span&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Përzgjidhni &lt;span style=&quot; font-weight:600;&quot;&gt;Shtoni një pajisje&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Do të merrni PIN-in e nevojshëm për të plotësuar këtë formular. PIN-i është i vlefshëm vetëm për &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuta&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="357"/>
@@ -1388,7 +1388,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="670"/>
         <source>Register your username on the network. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <translation>Regjistroni emrin tuaj në rrjet. Kjo do të sjellë rezervimin e emrit të përdoruesit për t’u përdorur vetëm nga ju. Shokët tuaj do të jenë në gjendje t’ju telefonojnë përmes emrit tuaj të përdoruesit, në vend se përmes ID-së tuaj.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="673"/>
@@ -1460,7 +1460,7 @@
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Po prodhohet llogaria juaj Jami…</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -1506,147 +1506,71 @@
         <translation>Dialog ndihmësi krijimi llogarie</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>Etiketë Mirëseardhjeje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Mirë se vini te</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>Logo Mirëseardhjeje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>Buton Lidhni pajisje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Buton për të shkaktuar fillimin e lidhjes së një llogarie</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Lidheni këtë pajisje me një llogari</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>Përzgjidhni metodë lidhjeje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>Lidhni llogari me pajisje prej rrjetit</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>Lidhni llogari prej DHT-je</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>Lidheni prej kartele arkivi të eksportuar llogarie</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>Lidhni llogari prej kartele</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Si të shtohet një pajisje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>Përzgjidhni kartelë për importim</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>Shteg arkivi llogarie:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>Përzgjedhës shtegu arkivi llogarie</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>Fjalëkalim arkivi:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>Dhënie fjalëkalimi arkivi</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Krijoni profilin tuaj</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>Widget Kioske Fotosh</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>Shfaqje avatarësh</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Jepni emrin tuaj të plotë:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>Përpunim i emrit të plotë</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>Dhënie teksti për përpunim emri të plotë</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Krijoni llogarinë tuaj</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,172 +1580,248 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>Përzgjidhni kartelë për importim</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>Shteg arkivi llogarie:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>Përzgjedhës shtegu arkivi llogarie</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>Fjalëkalim arkivi:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>Dhënie fjalëkalimi arkivi</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Krijoni profilin tuaj</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>Widget Kioske Fotosh</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>Shfaqje avatarësh</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Jepni emrin tuaj të plotë:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>Përpunim i emrit të plotë</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>Dhënie teksti për përpunim emri të plotë</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Krijoni llogarinë tuaj</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation>Buton Krijoni llogari Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation>Buton për të shkaktuar fillimin e krijimit të llogarisë Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation>Krijoni një llogari Jami</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
+        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
+        <translation>Regjistroni emrin tuaj të përdoruesit në Jami. Kjo do të sjellë rezervimin e emrit të përdoruesit për t’u përdorur vetëm nga ju. Shokët tuaj do të jenë në gjendje t’ju telefonojnë përmes emrit tuaj të përdoruesit, në vend se përmes ID-së tuaj.</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>Kutizë emri publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Kutizë përzgjedhjeje nëse përdoruesi dëshiron një emër publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Regjistroni emër përdoruesi publik (eksperimentale)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>Përpunim emri publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Zgjidhni mrin tuaj të përdoruesit</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>Gjendje vleftësimi emri publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Po kërkohet…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>Përpunim PIN-i</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>Dhënie PIN-i për lidhje pajisjeje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Jepni PIN-in tuaj</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>Dhënie teksti fjalëkalimi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>Dhënie teksti fjalëkalimi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Fjalëkalim</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>Dhënie teksti ripohimi fjalëkalimi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Ripohoni fjalëkalimin</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Po prodhohet llogaria juaj Jami…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>Buton Faqja e mëparshme</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>buton për të kaluar te faqja e mëparshme e ndihmësit</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>I mëparshmi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>Buton Faqja pasuese</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>buton për të kaluar te faqja pasuese e ndihmësit</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Pasuesi</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Lypset të migrohet llogaria juaj. Jepni fjalëkalimin tuaj.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>Po migrohet llogaria juaj Jami…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>Po importohet arkiv llogarie…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Shtoni një pajisje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Emër përdoruesi jo i passhëm.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Emri i përdoruesit mund të kihet.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Emri i përdoruesit është i pavlefshëm.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Gabim rrjeti.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Hapni Kartelë</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Kartela arkiv Jami (*.gz);; Krejt kartelat (*)</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index d19a7af..24a4d59 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -581,7 +581,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2644"/>
         <source>Export on the network</source>
-        <translation type="unfinished"/>
+        <translation>Exportera på nätverket</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Konversationer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklicka för att kopiera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Ett fel inträffade vid generering av QR-kod</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Lägg till i kontakter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Vill prata med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Svara</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ignorera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>Rensa konversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Ta bort kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>Blockera kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Kopiera nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Inkommande meddelande från %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Inkommande samtal från %1</translation>
     </message>
@@ -964,24 +972,24 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Ta ett foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>eller</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>Importera foto</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Importera</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Dela hela skärmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Dela skärmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Dela fil</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Välkommen till</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Koppla denna enhet till ett konto</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Hur man lägger till en enhet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Skapa din profil</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Ange ditt fullständiga namn:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Skapa ditt konto</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Skapa din profil</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Ange ditt fullständiga namn:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Skapa ditt konto</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Registrera ett offentligt namn (experimentellt)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Välj användarnamn</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Söker...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Ange din PIN-kod</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Bekräfta lösenord</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Föregående</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ditt konto måste migreras. Ange ditt lösenord.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Lägg till en enhet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Användarnamnet är inte tillgängligt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Användarnamnet är tillgängligt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Användarnamnet är ogiltigt.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Nätverksfel.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index 91ed2de..381659e 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Konuşmalar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>Kopyalamak için çift tıkla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>QR Kodu oluşturulurken hata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Kişilere ekle</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Sizinle konuşmak istiyor!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Yanıtla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Göz ardı et</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>Kişiyi kaldır</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Numarayı kopyala</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>%1&apos;den gelen ileti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>%1$s&apos;dan gelen arama</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Çıkış</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Hakkında</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Fotoğraf çek</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>veya</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>İçe Aktar</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Dosya Seç</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Dosyalar (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Dosya Seç</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Dosyalar (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Tüm ekranı paylaş</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Ekran alanı paylaş</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Dosya paylaş</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>Hoş Geldiniz</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>Bu aygıtı bir hesaba bağla</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>Bir aygıt nasıl eklenir</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>Profilinizi oluşturun</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>Tam adınızı girin:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>Hesabınızı oluşturun</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>Profilinizi oluşturun</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>Tam adınızı girin:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>Hesabınızı oluşturun</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>Halka açık kullanıcı adı kaydet (deneysel)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Kullanıcı adınızı seçin</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>Arama yapılıyor...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>Pin&apos;inizi girin</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Parolayı onayla</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>Önceki</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>İleri</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>Bir aygıt ekle</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>Kullanıcı adı uygun değil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>Kullanıcı adı uygun</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>Kullanıcı adı geçersiz.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>Ağ hatası.</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Dosyayı Aç</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 877694e..41ab50a 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>Групові чати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>Помилка при генерації QR-коду</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>Додати контакти</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>Хоче поговорити з вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>Відповідь</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>Ігнорувати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>Копіювати номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>Вхідне повідомлення від %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>Вхідний виклик від %1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>Вийти</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>Про программу</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>Зняти фото</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>чи</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>Імпортувати</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>Файли (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>Файли (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>Поділитися частиною екрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>Поділитися екраном</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>Відправити файл</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>Оберіть ваше ім&apos;я користувача</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>Підтвердити пароль</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>Далі</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>Відкрити файл</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index ba0477d..4c18f95 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>想要與你談天!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>接通</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation> </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
@@ -930,7 +938,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
         <source>Delete</source>
-        <translation type="unfinished"/>
+        <translation>刪除</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>從</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>或</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>載入</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>檔案(*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>檔案(*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>分享整個螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>分享部分螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>分享檔案</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>创建你的个人资料</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>创建你的账户</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>创建你的个人资料</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>创建你的账户</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>選擇你的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>下一步</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index 6cd8a3f..9464781 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -686,6 +686,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,32 +732,32 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>会话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -757,150 +765,150 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>双击复制</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>创建二维码时产生错误</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>想要与您通信!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>应答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>删除联系人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>消息来自%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>来电:%1</translation>
     </message>
@@ -964,17 +972,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
@@ -995,42 +1003,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>拍照</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>或</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>导入照片</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>倒入</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>选择文件</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>文件 (*)</translation>
     </message>
@@ -1038,12 +1026,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>选择文件</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>文件 (*)</translation>
     </message>
@@ -1147,17 +1135,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>共享整个屏幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>共享屏幕区域</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>共享文件</translation>
     </message>
@@ -1506,147 +1494,71 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>欢迎来到</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>将此设备与一个帐户进行连接</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>如何添加设备</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>创建您的帐户资料</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>输入您的全名:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>创建Ring帐户</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,170 +1568,246 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>创建您的帐户资料</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>输入您的全名:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>创建Ring帐户</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
         <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>注册公共用户名(试验性)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>设置您的用户名</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>正在搜索…</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>输入您的PIN</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>确认密码</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>上一步</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>下一步</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>您的Ring帐户可以被更新。\n请输入您的密码。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>添加设备</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>用户名不可用。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>用户名可用。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>用户名非法。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>网络错误。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>打开文件</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index e81ac2c..e21edb5 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -31,7 +31,8 @@
         <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Jami.
 Jami is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>Jami 的 Microsoft Windows 客戶端。
+Jami 是一個安全且分散式的通訊軟體。</translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -89,7 +90,7 @@
     <message>
         <location filename="../accountdetails.ui" line="350"/>
         <source>Public registered username</source>
-        <translation type="unfinished"/>
+        <translation>公開註冊使用者名稱</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="426"/>
@@ -126,7 +127,7 @@
     <message>
         <location filename="../accountdetails.ui" line="832"/>
         <source>Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>帳號設定</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
@@ -607,7 +608,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2565"/>
         <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
+        <translation>要新增新裝置到您的 Jami 帳號,您要先在網路上匯出您的帳號。這將會生成 PIN 碼,必須在生成後的 5 分鐘內輸入到您的新裝置上。</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2641"/>
@@ -686,6 +687,14 @@
     </message>
 </context>
 <context>
+    <name>AccountItemDelegate</name>
+    <message>
+        <location filename="../accountitemdelegate.cpp" line="76"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
@@ -724,183 +733,186 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="299"/>
+        <location filename="../callwidget.ui" line="324"/>
         <source>Show conversations</source>
         <translation>顯示對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="302"/>
+        <location filename="../callwidget.ui" line="327"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="225"/>
+        <location filename="../callwidget.ui" line="244"/>
         <source>Search contact text input</source>
         <translation>搜尋聯絡人文字輸入</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="234"/>
+        <location filename="../callwidget.ui" line="253"/>
         <source>Search contacts or enter ID</source>
-        <translation type="unfinished"/>
+        <translation>搜尋聯絡人或輸入 ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="585"/>
+        <location filename="../callwidget.ui" line="610"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami 是一套通用通訊的自由軟體,其尊重使用者的自由與隱私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="625"/>
+        <location filename="../callwidget.ui" line="650"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
                                       </source>
-        <translation type="unfinished"/>
+        <translation>
+ 這是您的 ID。
+複製並分享它給您的朋友!
+                                      </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="738"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Show ring ID QR code</source>
         <translation>顯示 Ring ID 二維條碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="789"/>
+        <location filename="../callwidget.ui" line="814"/>
         <source>Share ring ID button</source>
         <translation>分享 Ring ID 按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="847"/>
+        <location filename="../callwidget.ui" line="872"/>
         <source>Double-click to copy</source>
         <translation>雙擊以複製</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="913"/>
         <source>Error while generating QR Code</source>
         <translation>產生 QR Code 時發生錯誤</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1110"/>
-        <location filename="../callwidget.ui" line="1360"/>
+        <location filename="../callwidget.ui" line="1141"/>
+        <location filename="../callwidget.ui" line="1391"/>
         <source>best name</source>
         <translation>最佳名稱</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1134"/>
+        <location filename="../callwidget.ui" line="1165"/>
         <source>best Id</source>
         <translation>最佳 ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1645"/>
+        <location filename="../callwidget.ui" line="1682"/>
         <source>Back to homepage button</source>
         <translation>回到首頁按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1851"/>
+        <location filename="../callwidget.ui" line="1891"/>
         <source>Add to contacts</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="312"/>
+        <location filename="../callwidget.ui" line="337"/>
         <source>Show invites</source>
         <translation>顯示邀請</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="315"/>
+        <location filename="../callwidget.ui" line="340"/>
         <source>Invites</source>
         <translation>邀請</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1370"/>
+        <location filename="../callwidget.ui" line="1401"/>
         <source>Wants to talk to you!</source>
         <translation>想要與您說說話!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1443"/>
+        <location filename="../callwidget.ui" line="1474"/>
         <source>Answer incoming call button</source>
         <translation>答覆來電按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1515"/>
+        <location filename="../callwidget.ui" line="1546"/>
         <source>Ignore incoming call button</source>
         <translation>忽略來電按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1465"/>
+        <location filename="../callwidget.ui" line="1496"/>
         <source>Answer</source>
         <translation>回覆</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1543"/>
+        <location filename="../callwidget.ui" line="1574"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1206"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Cancel outgoing call</source>
         <translation>取消去電</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1231"/>
+        <location filename="../callwidget.ui" line="1262"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="264"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Start video call</source>
         <translation>開始視訊通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="275"/>
+        <location filename="../callwidget.cpp" line="311"/>
         <source>Start audio call</source>
         <translation>開始音訊通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="291"/>
+        <location filename="../callwidget.cpp" line="327"/>
         <source>Clear conversation</source>
         <translation>清除對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="298"/>
+        <location filename="../callwidget.cpp" line="334"/>
         <source>Remove contact</source>
         <translation>移除聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="305"/>
+        <location filename="../callwidget.cpp" line="341"/>
         <source>Block contact</source>
         <translation>阻擋連絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="316"/>
+        <location filename="../callwidget.cpp" line="352"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>Contact me on Jami</source>
-        <translation type="unfinished"/>
+        <translation>在 Jami 上聯絡我</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="844"/>
+        <location filename="../callwidget.cpp" line="922"/>
         <source>My Id is : </source>
-        <translation type="unfinished"/>
+        <translation>我的 Id 是:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="223"/>
+        <location filename="../callwidget.cpp" line="259"/>
         <source>Message incoming from %1</source>
         <translation>從 %1 來的訊息</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="755"/>
+        <location filename="../callwidget.cpp" line="835"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="760"/>
+        <location filename="../callwidget.cpp" line="840"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="615"/>
+        <location filename="../callwidget.cpp" line="658"/>
         <source>Call incoming from %1</source>
         <translation>從 %1 的來電</translation>
     </message>
@@ -910,22 +922,22 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="35"/>
         <source>Account deletion</source>
-        <translation type="unfinished"/>
+        <translation>帳號刪除</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="55"/>
         <source>Do you really want to delete the following account?</source>
-        <translation type="unfinished"/>
+        <translation>您真的想要刪除以下的帳號嗎?</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="135"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
-        <translation type="unfinished"/>
+        <translation>若此帳號尚未匯出,或是新增到其他裝置,它將會不可逆地遺失。</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="212"/>
         <source>Permanently delete account</source>
-        <translation type="unfinished"/>
+        <translation>永久刪除帳號</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="218"/>
@@ -935,7 +947,7 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="250"/>
         <source>Cancel account deletion</source>
-        <translation type="unfinished"/>
+        <translation>取消帳號刪除</translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="256"/>
@@ -964,24 +976,24 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="77"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="90"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="110"/>
+        <location filename="../mainwindow.cpp" line="103"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Jami</source>
-        <translation type="unfinished"/>
+        <translation>Jami</translation>
     </message>
 </context>
 <context>
@@ -995,42 +1007,22 @@
 <context>
     <name>PhotoboothWidget</name>
     <message>
-        <location filename="../photoboothwidget.ui" line="14"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
         <source>Form</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="20"/>
+        <location filename="../photoboothwidget.ui" line="129"/>
         <source>Photobooth display</source>
         <translation>大頭貼相機顯示</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="51"/>
-        <source>Take photo</source>
-        <translation>照相</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="71"/>
-        <source>or</source>
-        <translation>或</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
-        <source>Import photo</source>
-        <translation>匯入圖片</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="87"/>
-        <source>Import</source>
-        <translation>匯入</translation>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.cpp" line="60"/>
+        <location filename="../photoboothwidget.cpp" line="71"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="62"/>
+        <location filename="../photoboothwidget.cpp" line="73"/>
         <source>Files (*)</source>
         <translation>檔案 (*)</translation>
     </message>
@@ -1038,12 +1030,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="339"/>
+        <location filename="../messagewebview.cpp" line="337"/>
         <source>Files (*)</source>
         <translation>檔案 (*)</translation>
     </message>
@@ -1058,24 +1050,24 @@
     <message>
         <location filename="../settingsitemwidget.cpp" line="68"/>
         <source>Edit Device Name</source>
-        <translation type="unfinished"/>
+        <translation>編輯裝置名稱</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="74"/>
         <source>Unlink Device From Account</source>
-        <translation type="unfinished"/>
+        <translation>從帳號取消連結裝置</translation>
     </message>
     <message>
         <location filename="../settingsitemwidget.cpp" line="90"/>
         <source>Unblock Contact</source>
-        <translation type="unfinished"/>
+        <translation>取消封鎖聯絡人</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
         <source>Jami account</source>
         <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
+        <translation>Jami 帳號</translation>
     </message>
 </context>
 <context>
@@ -1147,17 +1139,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="275"/>
+        <location filename="../videoview.cpp" line="279"/>
         <source>Share entire screen</source>
         <translation>分享整個螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="278"/>
+        <location filename="../videoview.cpp" line="282"/>
         <source>Share screen area</source>
         <translation>分享螢幕區域</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="285"/>
+        <location filename="../videoview.cpp" line="289"/>
         <source>Share file</source>
         <translation>分享檔案</translation>
     </message>
@@ -1172,7 +1164,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>正在遷移您的 Jami 帳號……</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1212,7 +1204,7 @@
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Jami 封存檔 (*.gz);; 所有檔案 (*)</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1279,17 +1271,17 @@
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
         <source>Create Jami account button</source>
-        <translation type="unfinished"/>
+        <translation>建立 Jami 帳號按鈕</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
         <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
+        <translation>Jami 帳號建立開始觸發請按下按鈕</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Jami account</source>
-        <translation type="unfinished"/>
+        <translation>建立 Jami 帳號</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1338,7 +1330,16 @@
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&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:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;要連結此裝置到其他帳號,首先您&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;需要取得 PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; 碼。要生成 PIN 碼:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;到&lt;span style=&quot; font-weight:600;&quot;&gt;帳號管理設定頁面&lt;/span&gt;在前一臺裝置&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;選擇您想要使用的 &lt;span style=&quot; font-weight:600;&quot;&gt;Jami 帳號&lt;/span&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;到&lt;span style=&quot; font-weight:600;&quot;&gt;裝置&lt;/span&gt;分頁&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;選取&lt;span style=&quot; font-weight:600;&quot;&gt;新增裝置&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;您將會得到必要的 PIN 碼以完成此表單。PIN 碼僅在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分鐘&lt;/span&gt;內有效&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="357"/>
@@ -1388,7 +1389,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="670"/>
         <source>Register your username on the network. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <translation>在 Jami 上註冊您的使用者名稱。這將會保留使用者名稱,只有您可以使用它。您的朋友將可以使用您的使用者名稱來與您通話,而不用使用您的 ID。</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="673"/>
@@ -1460,7 +1461,7 @@
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>正在生成您的 Jami 帳號……</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -1506,147 +1507,71 @@
         <translation>建立帳號精靈對話框</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="72"/>
+        <location filename="../wizardwidget.ui" line="99"/>
         <source>Welcome Label</source>
         <translation>歡迎標籤</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="78"/>
+        <location filename="../wizardwidget.ui" line="105"/>
         <source> Welcome to</source>
         <translation>歡迎來到</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="107"/>
+        <location filename="../wizardwidget.ui" line="134"/>
         <source>Welcome Logo</source>
         <translation>歡迎圖示</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="164"/>
+        <location filename="../wizardwidget.ui" line="191"/>
         <source>Link device button</source>
         <translation>連結裝置按鈕</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="170"/>
+        <location filename="../wizardwidget.ui" line="197"/>
         <source>Push button for device linkage start trigger</source>
         <translation>裝置連結開始觸發請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="173"/>
+        <location filename="../wizardwidget.ui" line="200"/>
         <source>Link this device to an account</source>
         <translation>連結這個裝置到一個帳號</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="205"/>
+        <location filename="../wizardwidget.ui" line="232"/>
         <source>Select link method</source>
         <translation>選取連結方法</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="254"/>
+        <location filename="../wizardwidget.ui" line="281"/>
         <source>Link account to device from the network</source>
         <translation>從網路連結帳號到裝置</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="257"/>
+        <location filename="../wizardwidget.ui" line="284"/>
         <source>Link account from DHT</source>
         <translation>從 DHT 連結帳號</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="270"/>
+        <location filename="../wizardwidget.ui" line="297"/>
         <source>Link from exported account archive file</source>
         <translation>從已匯出的帳號封存檔連結</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="273"/>
+        <location filename="../wizardwidget.ui" line="300"/>
         <source>Link account from file</source>
         <translation>從檔案連結帳號</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="322"/>
+        <location filename="../wizardwidget.ui" line="349"/>
         <source>How to add a device</source>
         <translation>如何新增裝置</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation>選取要匯入的檔案</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation>帳號封存檔路徑</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation>帳號封存檔路徑選取器</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation>封存檔密碼</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation>封存檔密碼輸入</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation>建立您的介紹</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation>大頭貼相機小工具</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation>大頭貼顯示</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation>輸入您的完整名稱:</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation>完整名稱編輯</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation>完整名稱輸入的文字項目</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation>建立您的帳號</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Jami account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Jami account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Jami account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="329"/>
+        <location filename="../wizardwidget.ui" line="356"/>
         <source>&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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
 &lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
 &lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
@@ -1656,172 +1581,248 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
-        <translation type="unfinished"/>
+        <location filename="../wizardwidget.ui" line="384"/>
+        <source>Select file to import</source>
+        <translation>選取要匯入的檔案</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="673"/>
+        <location filename="../wizardwidget.ui" line="409"/>
+        <source>Account archive path:</source>
+        <translation>帳號封存檔路徑</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="416"/>
+        <source>Account archive path selector</source>
+        <translation>帳號封存檔路徑選取器</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="433"/>
+        <source>Archive password:</source>
+        <translation>封存檔密碼</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="440"/>
+        <source>Archive passord input</source>
+        <translation>封存檔密碼輸入</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="477"/>
+        <source>Create your profile</source>
+        <translation>建立您的介紹</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Photobooth Widget</source>
+        <translation>大頭貼相機小工具</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="536"/>
+        <source>Avatar display</source>
+        <translation>大頭貼顯示</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="591"/>
+        <source>Enter your full name:</source>
+        <translation>輸入您的完整名稱:</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="615"/>
+        <source>Full name edit</source>
+        <translation>完整名稱編輯</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="621"/>
+        <source>Text entry for full name input</source>
+        <translation>完整名稱輸入的文字項目</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="656"/>
+        <location filename="../wizardwidget.cpp" line="171"/>
+        <source>Create your account</source>
+        <translation>建立您的帳號</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="166"/>
+        <source>Create Jami account button</source>
+        <translation>建立 Jami 帳號按鈕</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="172"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation>Jami 帳號建立開始觸發請按下按鈕</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="178"/>
+        <source>Create Jami account</source>
+        <translation>建立 Jami 帳號</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="697"/>
+        <source>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</source>
+        <translation>在 Jami 上註冊您的使用者名稱。這將會保留使用者名稱,只有您可以使用它。您的朋友將可以使用您的使用者名稱來與您通話,而不用使用您的 ID。</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="700"/>
         <source>Public username checkbox</source>
         <translation>公開使用者名稱勾選框</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="676"/>
+        <location filename="../wizardwidget.ui" line="703"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>若使用者想要一個公開的使用者名稱就在勾選框打勾</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="679"/>
+        <location filename="../wizardwidget.ui" line="706"/>
         <source>Register public username (experimental)</source>
         <translation>註冊公開的使用者名稱(實驗性)</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="724"/>
+        <location filename="../wizardwidget.ui" line="751"/>
         <source>Public username edit</source>
         <translation>公開使用者名稱編輯</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="730"/>
+        <location filename="../wizardwidget.ui" line="757"/>
         <source>Choose your username</source>
         <translation>選擇您的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="746"/>
+        <location filename="../wizardwidget.ui" line="773"/>
         <source>Public username validation status</source>
         <translation>公開使用者名稱驗證狀態</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="749"/>
-        <location filename="../wizardwidget.cpp" line="253"/>
+        <location filename="../wizardwidget.ui" line="776"/>
+        <location filename="../wizardwidget.cpp" line="257"/>
         <source>Searching...</source>
         <translation>正在搜尋...</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="778"/>
+        <location filename="../wizardwidget.ui" line="805"/>
         <source>PIN edit</source>
         <translation>PIN 編輯</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="784"/>
+        <location filename="../wizardwidget.ui" line="811"/>
         <source>Device linking PIN text entry</source>
         <translation>裝置連結 PIN 文字項目</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="787"/>
+        <location filename="../wizardwidget.ui" line="814"/>
         <source>Enter your pin</source>
         <translation>輸入您的 PIN 碼</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="814"/>
+        <location filename="../wizardwidget.ui" line="841"/>
         <source>Password text input</source>
         <translation>密碼文字輸入</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="820"/>
+        <location filename="../wizardwidget.ui" line="847"/>
         <source>Password text entry</source>
         <translation>密碼文字項目</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="826"/>
+        <location filename="../wizardwidget.ui" line="853"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="853"/>
-        <location filename="../wizardwidget.ui" line="859"/>
+        <location filename="../wizardwidget.ui" line="880"/>
+        <location filename="../wizardwidget.ui" line="886"/>
         <source>Password confirmation text input</source>
         <translation>確認密碼文字輸入</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="865"/>
+        <location filename="../wizardwidget.ui" line="892"/>
         <source>Confirm password</source>
         <translation>確認密碼</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="933"/>
-        <location filename="../wizardwidget.cpp" line="101"/>
+        <location filename="../wizardwidget.ui" line="960"/>
+        <location filename="../wizardwidget.cpp" line="105"/>
         <source>Generating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>正在生成您的 Jami 帳號……</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="969"/>
+        <location filename="../wizardwidget.ui" line="996"/>
         <source>Previous page button</source>
         <translation>先前頁面按鈕</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="975"/>
+        <location filename="../wizardwidget.ui" line="1002"/>
         <source>push button to access previous page of wizard</source>
         <translation>存取前一頁精靈請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="978"/>
+        <location filename="../wizardwidget.ui" line="1005"/>
         <source>Previous</source>
         <translation>前一個</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1010"/>
+        <location filename="../wizardwidget.ui" line="1037"/>
         <source>Next page Button</source>
         <translation>下一頁按鈕</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1016"/>
+        <location filename="../wizardwidget.ui" line="1043"/>
         <source>Push button to access next page of wizard</source>
         <translation>存取下一頁精靈請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="1019"/>
+        <location filename="../wizardwidget.ui" line="1046"/>
         <source>Next</source>
         <translation>下一個</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="71"/>
+        <location filename="../wizardwidget.cpp" line="66"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>您的帳號需要遷移。輸入您的密碼。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="97"/>
+        <location filename="../wizardwidget.cpp" line="101"/>
         <source>Migrating your Jami account...</source>
-        <translation type="unfinished"/>
+        <translation>正在遷移您的 Jami 帳號……</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="99"/>
+        <location filename="../wizardwidget.cpp" line="103"/>
         <source>Importing account archive...</source>
         <translation>正在匯入帳號封存檔……</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="163"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
         <source>Add a device</source>
         <translation>新增裝置</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="281"/>
+        <location filename="../wizardwidget.cpp" line="285"/>
         <source>Username not available.</source>
         <translation>使用者名稱不可用</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="284"/>
+        <location filename="../wizardwidget.cpp" line="288"/>
         <source>Username is available.</source>
         <translation>使用者名稱可用。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="287"/>
+        <location filename="../wizardwidget.cpp" line="291"/>
         <source>Username is invalid.</source>
         <translation>使用者名稱無效。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="290"/>
+        <location filename="../wizardwidget.cpp" line="294"/>
         <source>Network error.</source>
         <translation>網路錯誤。</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="337"/>
+        <location filename="../wizardwidget.cpp" line="341"/>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.cpp" line="339"/>
+        <location filename="../wizardwidget.cpp" line="343"/>
         <source>Jami archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Jami 封存檔 (*.gz);; 所有檔案 (*)</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file