redesign of profile add / edit pane

assets/core/account_circle-24px_lines_thin-blocked.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<path class="st0" d="M0,0h24v24H0V0z"/>
+<g>
+	<circle class="st0" cx="12" cy="9.5" r="1.5"/>
+	<path class="st0" d="M10.7,12.7c-1.3-0.5-2.2-1.8-2.2-3.2C8.5,7.6,10.1,6,12,6c1.7,0,3.2,1.3,3.4,2.9l2.7-2.1C16.6,5.1,14.4,4,12,4
+		c-4.4,0-8,3.6-8,8c0,1.8,0.6,3.5,1.6,4.7L10.7,12.7z"/>
+	<path class="st0" d="M12,16.5c-1.9,0-4.5,0.9-4.9,1.8c1.3,1.1,3,1.7,4.9,1.7s3.6-0.6,4.9-1.7C16.5,17.4,13.9,16.5,12,16.5z"/>
+	<path class="st0" d="M18.6,7.4l-3.1,2.4C15.3,11.6,13.8,13,12,13c-0.1,0-0.3,0-0.4,0l-2.5,2c1.1-0.3,2.2-0.4,2.9-0.4
+		c1.5,0,4.9,0.6,6.4,2.3c1-1.3,1.6-3,1.6-4.8C20,10.3,19.5,8.7,18.6,7.4z"/>
+	<path d="M12,3.4c-4.7,0-8.6,3.8-8.6,8.6c0,4.7,3.8,8.6,8.6,8.6c4.7,0,8.6-3.8,8.6-8.6C20.6,7.3,16.7,3.4,12,3.4z M12,4
+		c2.4,0,4.6,1.1,6.1,2.8l-2.7,2.1C15.2,7.3,13.7,6,12,6c-1.9,0-3.5,1.6-3.5,3.5c0,1.4,0.9,2.7,2.2,3.2l-5.1,4c-1-1.3-1.6-3-1.6-4.7
+		C4,7.6,7.6,4,12,4z M10.5,9.5C10.5,8.7,11.2,8,12,8s1.5,0.7,1.5,1.5S12.8,11,12,11S10.5,10.3,10.5,9.5z M12,20
+		c-1.9,0-3.6-0.6-4.9-1.7c0.4-0.9,3-1.8,4.9-1.8s4.5,0.9,4.9,1.8C15.6,19.4,13.9,20,12,20z M12,14.5c-0.7,0-1.8,0.1-2.9,0.4l2.5-2
+		c0.1,0,0.3,0,0.4,0c1.8,0,3.3-1.4,3.5-3.1l3.1-2.4C19.5,8.7,20,10.3,20,12c0,1.8-0.6,3.5-1.6,4.8C16.9,15.1,13.5,14.5,12,14.5z"/>
+</g>
+</svg>

assets/core/account_circle-24px_negative_space.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<g id="Layer_1">
+	<path class="st0" d="M0,0h24v24H0V0z"/>
+	<g>
+		<circle cx="12" cy="8" r="3"/>
+		<path d="M12,12.9c-2,0-6,1.1-6,3.1c1.3,1.9,3.5,3.2,6,3.2s4.7-1.3,6-3.2C18,14,14,12.9,12,12.9z"/>
+	</g>
+</g>
+<g id="Layer_2">
+</g>
+</svg>

i18n/translation_de.ts

@@ -292,55 +292,55 @@
 <context>
     <name>PeerSettingsPane</name>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="27"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
         <source>address-label</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="32"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
         <source>copy-btn</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation>in die Zwischenablage kopiert</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="48"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
         <source>display-name-label</source>
         <translation>Angezeigter Name</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="52"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
         <source>save-btn</source>
         <translation>speichern</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="89"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
         <source>save-peer-history-description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="98"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
         <source>dont-save-peer-history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="120"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
         <source>delete-btn</source>
         <translation>löschen</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
         <source>block-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,114 +348,120 @@
 <context>
     <name>ProfileAddEditPane</name>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="35"/>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="260"/>
         <source>default-profile-name</source>
         <extracomment>default suggested profile name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="168"/>
         <source>profile-onion-label</source>
-        <extracomment>Onion</extracomment>
+        <extracomment>Send this address to peers you want to connect with</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="179"/>
         <source>copy-btn</source>
         <translation type="unfinished">Kopieren</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation type="unfinished">in die Zwischenablage kopiert</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="276"/>
-        <source>profile-name</source>
-        <extracomment>Display name</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
         <source>radio-use-password</source>
         <extracomment>Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="286"/>
         <source>radio-no-password</source>
         <extracomment>Unencrypted (No password)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="210"/>
         <source>no-password-warning</source>
         <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>new-profile</source>
+        <extracomment>New Profile || Edit Profile</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>edit-profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="304"/>
         <source>current-password-label</source>
         <extracomment>Current Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="322"/>
         <source>password1-label</source>
         <extracomment>Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="340"/>
         <source>password2-label</source>
         <extracomment>Reenter password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>create-profile-btn</source>
-        <extracomment>Create Profile || Save Profile</extracomment>
+        <extracomment>Create || Save</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>save-profile-btn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="352"/>
         <source>password-error-match</source>
         <extracomment>Passwords do not match</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="363"/>
         <source>password-change-error</source>
         <extracomment>Error changing password: Supplied password rejected</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="420"/>
         <source>delete-profile-btn</source>
         <extracomment>Delete Profile</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="439"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="452"/>
         <source>delete-confirm-label</source>
         <extracomment>Type DELETE to confirm</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="463"/>
         <source>delete-profile-confirm-btn</source>
         <extracomment>Really Delete Profile</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="468"/>
         <source>delete-confirm-text</source>
         <extracomment>DELETE</extracomment>
         <translation type="unfinished"></translation>
@@ -520,66 +526,66 @@
         <translation type="vanished">Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="24"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="25"/>
         <source>setting-language</source>
         <extracomment>Language</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="35"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
         <source>locale-en</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
         <source>locale-fr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
         <source>locale-pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="39"/>
         <source>locale-de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="56"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="57"/>
         <source>setting-interface-zoom</source>
         <extracomment>Interface Zoom</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="87"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="88"/>
         <source>large-text-label</source>
         <translation>Groß</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="95"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="96"/>
         <source>setting-theme</source>
         <extracomment>Theme</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="104"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
         <source>theme-light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="106"/>
         <source>theme-dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="154"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="155"/>
         <source>version %1</source>
         <extracomment>Version %1</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="163"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="164"/>
         <source>builddate %2</source>
         <extracomment>Built on: %2</extracomment>
         <translation type="unfinished"></translation>
@@ -590,7 +596,7 @@
         <translation type="vanished">defaultmäßige Textgröße (Skalierungsfaktor:</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="63"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="64"/>
         <source>small-text-label</source>
         <translation>Klein</translation>
     </message>

i18n/translation_en.ts

@@ -172,7 +172,7 @@ Right-click to reset.</translation>
         <location filename="../qml/panes/GroupSettingsPane.qml" line="72"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
-        <translation type="unfinished">Copied to Clipboard</translation>
+        <translation>Copied to Clipboard</translation>
     </message>
     <message>
         <location filename="../qml/panes/GroupSettingsPane.qml" line="63"/>
@@ -197,12 +197,12 @@ Right-click to reset.</translation>
     <message>
         <location filename="../qml/panes/GroupSettingsPane.qml" line="108"/>
         <source>server-synced</source>
-        <translation >Synced</translation>
+        <translation>Synced</translation>
     </message>
     <message>
         <location filename="../qml/panes/GroupSettingsPane.qml" line="108"/>
         <source>server-not-synced</source>
-        <translation >Out of Sync</translation>
+        <translation>Out of Sync</translation>
     </message>
     <message>
         <location filename="../qml/panes/GroupSettingsPane.qml" line="124"/>
@@ -372,50 +372,50 @@ Right-click to reset.</translation>
 <context>
     <name>PeerSettingsPane</name>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="27"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
         <source>address-label</source>
         <translation>Address</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="32"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
         <source>copy-btn</source>
         <translation>Copy</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation>Copied to Clipboard</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="48"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
         <source>display-name-label</source>
         <translation>Display Name</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="52"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
         <source>save-btn</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
         <source>block-btn</source>
         <translation>Block Peer</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="89"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation>Save Peer History</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
         <source>save-peer-history-description</source>
         <translation>Determines whether or not to delete any history associated with the peer.</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="98"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
         <source>dont-save-peer-history</source>
         <translation>Delete Peer History</translation>
     </message>
@@ -424,7 +424,7 @@ Right-click to reset.</translation>
         <translation type="vanished">Unblock Peer</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="120"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
         <source>delete-btn</source>
         <translation>Delete</translation>
     </message>
@@ -440,114 +440,125 @@ Right-click to reset.</translation>
         <translation type="vanished">Edit Profile</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
         <source>profile-name</source>
         <extracomment>Display name</extracomment>
-        <translation>Display name</translation>
+        <translation type="vanished">Display name</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="35"/>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="260"/>
         <source>default-profile-name</source>
         <extracomment>default suggested profile name</extracomment>
         <translation>Alice</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
-        <source>profile-onion-label</source>
+        <source>new-profile</source>
-        <extracomment>Onion</extracomment>
+        <extracomment>New Profile || Edit Profile</extracomment>
-        <translation>Onion</translation>
+        <translation>New Profile</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>edit-profile</source>
+        <translation>Edit Profille</translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="168"/>
+        <source>profile-onion-label</source>
+        <extracomment>Send this address to peers you want to connect with</extracomment>
+        <translation>Send this address to peers you want to connect with</translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="179"/>
         <source>copy-btn</source>
         <translation>Copy</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation>Copied to Clipboard</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="276"/>
         <source>radio-use-password</source>
         <extracomment>Password</extracomment>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="286"/>
         <source>radio-no-password</source>
         <extracomment>Unencrypted (No password)</extracomment>
         <translation>Unencrypted (No password)</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="210"/>
         <source>no-password-warning</source>
         <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
         <translation>Not using a password on this account means that all data stored locally will not be encrypted</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="304"/>
         <source>current-password-label</source>
         <extracomment>Current Password</extracomment>
         <translation>Current Password</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="322"/>
         <source>password1-label</source>
         <extracomment>Password</extracomment>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="340"/>
         <source>password2-label</source>
         <extracomment>Reenter password</extracomment>
         <translation>Reenter password</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>create-profile-btn</source>
-        <extracomment>Create Profile || Save Profile</extracomment>
+        <extracomment>Create || Save</extracomment>
         <translation>Create Profile</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>save-profile-btn</source>
         <translation>Save Profile</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="352"/>
         <source>password-error-match</source>
         <extracomment>Passwords do not match</extracomment>
         <translation>Passwords do not match</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="363"/>
         <source>password-change-error</source>
         <extracomment>Error changing password: Supplied password rejected</extracomment>
         <translation>Error changing password: Supplied password rejected</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="420"/>
         <source>delete-profile-btn</source>
         <extracomment>Delete Profile</extracomment>
         <translation>Delete Profile</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="439"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="452"/>
         <source>delete-confirm-label</source>
         <extracomment>Type DELETE to confirm</extracomment>
         <translation>Type DELETE to confirm</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="463"/>
         <source>delete-profile-confirm-btn</source>
         <extracomment>Really Delete Profile</extracomment>
         <translation>Really Delete Profile</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="468"/>
         <source>delete-confirm-text</source>
         <extracomment>DELETE</extracomment>
         <translation>DELETE</translation>
@@ -621,66 +632,66 @@ Right-click to reset.</translation>
         <translation type="vanished">Block Unknown Peers</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="24"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="25"/>
         <source>setting-language</source>
         <extracomment>Language</extracomment>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="35"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
         <source>locale-en</source>
         <translation>English</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
         <source>locale-fr</source>
         <translation>Frances</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
         <source>locale-pt</source>
         <translation>Portuguesa</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="39"/>
         <source>locale-de</source>
         <translation>Deutsche</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="56"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="57"/>
         <source>setting-interface-zoom</source>
         <extracomment>Interface Zoom</extracomment>
         <translation>Zoom level</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="87"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="88"/>
         <source>large-text-label</source>
         <translation>Large</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="95"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="96"/>
         <source>setting-theme</source>
         <extracomment>Theme</extracomment>
         <translation>Theme</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="104"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
         <source>theme-light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="106"/>
         <source>theme-dark</source>
         <translation>Dark</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="154"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="155"/>
         <source>version %1</source>
         <extracomment>Version %1</extracomment>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="163"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="164"/>
         <source>builddate %2</source>
         <extracomment>Built on: %2</extracomment>
         <translation>Built on: %2</translation>
@@ -691,7 +702,7 @@ Right-click to reset.</translation>
         <translation type="vanished">Default size text (scale factor:</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="63"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="64"/>
         <source>small-text-label</source>
         <translation>Small</translation>
     </message>

i18n/translation_fr.ts

@@ -292,55 +292,55 @@
 <context>
     <name>PeerSettingsPane</name>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="27"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
         <source>address-label</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="32"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
         <source>copy-btn</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation>Copié dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="48"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
         <source>display-name-label</source>
         <translation>Pseudo</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="52"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
         <source>save-btn</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="89"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
         <source>save-peer-history-description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="98"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
         <source>dont-save-peer-history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="120"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
         <source>delete-btn</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
         <source>block-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,114 +348,120 @@
 <context>
     <name>ProfileAddEditPane</name>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="35"/>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="260"/>
         <source>default-profile-name</source>
         <extracomment>default suggested profile name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="168"/>
         <source>profile-onion-label</source>
-        <extracomment>Onion</extracomment>
+        <extracomment>Send this address to peers you want to connect with</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="179"/>
         <source>copy-btn</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation type="unfinished">Copié dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="276"/>
-        <source>profile-name</source>
-        <extracomment>Display name</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
         <source>radio-use-password</source>
         <extracomment>Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="286"/>
         <source>radio-no-password</source>
         <extracomment>Unencrypted (No password)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="210"/>
         <source>no-password-warning</source>
         <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>new-profile</source>
+        <extracomment>New Profile || Edit Profile</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>edit-profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="304"/>
         <source>current-password-label</source>
         <extracomment>Current Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="322"/>
         <source>password1-label</source>
         <extracomment>Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="340"/>
         <source>password2-label</source>
         <extracomment>Reenter password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>create-profile-btn</source>
-        <extracomment>Create Profile || Save Profile</extracomment>
+        <extracomment>Create || Save</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>save-profile-btn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="352"/>
         <source>password-error-match</source>
         <extracomment>Passwords do not match</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="363"/>
         <source>password-change-error</source>
         <extracomment>Error changing password: Supplied password rejected</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="420"/>
         <source>delete-profile-btn</source>
         <extracomment>Delete Profile</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="439"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="452"/>
         <source>delete-confirm-label</source>
         <extracomment>Type DELETE to confirm</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="463"/>
         <source>delete-profile-confirm-btn</source>
         <extracomment>Really Delete Profile</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="468"/>
         <source>delete-confirm-text</source>
         <extracomment>DELETE</extracomment>
         <translation type="unfinished"></translation>
@@ -520,66 +526,66 @@
         <translation type="vanished">Interface zoom (essentiellement la taille du texte et des composants de l&apos;interface)</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="24"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="25"/>
         <source>setting-language</source>
         <extracomment>Language</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="35"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
         <source>locale-en</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
         <source>locale-fr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
         <source>locale-pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="39"/>
         <source>locale-de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="56"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="57"/>
         <source>setting-interface-zoom</source>
         <extracomment>Interface Zoom</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="87"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="88"/>
         <source>large-text-label</source>
         <translation type="unfinished">Large</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="95"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="96"/>
         <source>setting-theme</source>
         <extracomment>Theme</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="104"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
         <source>theme-light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="106"/>
         <source>theme-dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="154"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="155"/>
         <source>version %1</source>
         <extracomment>Version %1</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="163"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="164"/>
         <source>builddate %2</source>
         <extracomment>Built on: %2</extracomment>
         <translation type="unfinished"></translation>
@@ -590,7 +596,7 @@
         <translation type="vanished">Taille par défaut du texte (échelle:</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="63"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="64"/>
         <source>small-text-label</source>
         <translation>Petit</translation>
     </message>

i18n/translation_pt.ts

@@ -292,55 +292,55 @@
 <context>
     <name>PeerSettingsPane</name>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="27"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
         <source>address-label</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="32"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
         <source>copy-btn</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation>Copiado</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="48"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
         <source>display-name-label</source>
         <translation>Nome de Exibição</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="52"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
         <source>save-btn</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="89"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
         <source>save-peer-history-description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="98"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
         <source>dont-save-peer-history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="120"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
         <source>delete-btn</source>
         <translation>Deletar</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
         <source>block-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,114 +348,120 @@
 <context>
     <name>ProfileAddEditPane</name>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="25"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="35"/>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="99"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="260"/>
         <source>default-profile-name</source>
         <extracomment>default suggested profile name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="70"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="168"/>
         <source>profile-onion-label</source>
-        <extracomment>Onion</extracomment>
+        <extracomment>Send this address to peers you want to connect with</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="75"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="179"/>
         <source>copy-btn</source>
         <translation type="unfinished">Copiar</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="79"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="183"/>
         <source>copied-to-clipboard-notification</source>
         <extracomment>notification: copied to clipboard</extracomment>
         <translation type="unfinished">Copiado</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="92"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="276"/>
-        <source>profile-name</source>
-        <extracomment>Display name</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="118"/>
         <source>radio-use-password</source>
         <extracomment>Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="128"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="286"/>
         <source>radio-no-password</source>
         <extracomment>Unencrypted (No password)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="138"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="210"/>
         <source>no-password-warning</source>
         <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="150"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>new-profile</source>
+        <extracomment>New Profile || Edit Profile</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="111"/>
+        <source>edit-profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="304"/>
         <source>current-password-label</source>
         <extracomment>Current Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="166"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="322"/>
         <source>password1-label</source>
         <extracomment>Password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="186"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="340"/>
         <source>password2-label</source>
         <extracomment>Reenter password</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>create-profile-btn</source>
-        <extracomment>Create Profile || Save Profile</extracomment>
+        <extracomment>Create || Save</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="209"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="375"/>
         <source>save-profile-btn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="241"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="352"/>
         <source>password-error-match</source>
         <extracomment>Passwords do not match</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="249"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="363"/>
         <source>password-change-error</source>
         <extracomment>Error changing password: Supplied password rejected</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="267"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="420"/>
         <source>delete-profile-btn</source>
         <extracomment>Delete Profile</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="281"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="439"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="452"/>
         <source>delete-confirm-label</source>
         <extracomment>Type DELETE to confirm</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="297"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="463"/>
         <source>delete-profile-confirm-btn</source>
         <extracomment>Really Delete Profile</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileAddEditPane.qml" line="303"/>
+        <location filename="../qml/panes/ProfileAddEditPane.qml" line="468"/>
         <source>delete-confirm-text</source>
         <extracomment>DELETE</extracomment>
         <translation type="unfinished"></translation>
@@ -520,66 +526,66 @@
         <translation type="vanished">Zoom da interface (afeta principalmente tamanho de texto e botões)</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="24"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="25"/>
         <source>setting-language</source>
         <extracomment>Language</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="35"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
         <source>locale-en</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="36"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
         <source>locale-fr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="37"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
         <source>locale-pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="38"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="39"/>
         <source>locale-de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="56"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="57"/>
         <source>setting-interface-zoom</source>
         <extracomment>Interface Zoom</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="87"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="88"/>
         <source>large-text-label</source>
         <translation>Grande</translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="95"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="96"/>
         <source>setting-theme</source>
         <extracomment>Theme</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="104"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
         <source>theme-light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="105"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="106"/>
         <source>theme-dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="154"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="155"/>
         <source>version %1</source>
         <extracomment>Version %1</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="163"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="164"/>
         <source>builddate %2</source>
         <extracomment>Built on: %2</extracomment>
         <translation type="unfinished"></translation>
@@ -590,7 +596,7 @@
         <translation type="vanished">Texto tamanho padrão (fator de escala: </translation>
     </message>
     <message>
-        <location filename="../qml/panes/SettingsPane.qml" line="63"/>
+        <location filename="../qml/panes/SettingsPane.qml" line="64"/>
         <source>small-text-label</source>
         <translation>Pequeno</translation>
     </message>

qml/opaque

@@ -1 +1 @@
-Subproject commit 12b7e51497868515401edc68be5514c020472da9
+Subproject commit c33a868d0c39929c3cc75ad272f7c9c27da50b2e

qml/panes/PeerSettingsPane.qml

@@ -15,6 +15,7 @@ import "../const"
 Opaque.SettingsList { // settingsPane
     id: root
     anchors.fill: parent
+    anchors.topMargin: 20
 
     property string authorization
     property string saveHistory

qml/panes/ProfileAddEditPane.qml

@@ -8,11 +8,19 @@ import QtQuick.Window 2.11
 
 import "../opaque" as Opaque
 import "../opaque/theme"
+import "../opaque/fonts"
 //  import "../styles"
 
-Opaque.SettingsList { // Add Profile Pane
+Opaque.Flickable {
-    id: profileAddEditPane
+    id: flickRoot
-    anchors.fill: parent
+    Layout.fillHeight: true
+    Layout.fillWidth: true
+
+    contentWidth: rc.width
+    contentHeight: rc.height
+
+    readonly property string mode_add: "add"
+    readonly property string mode_edit: "edit"
 
     property string mode // edit or add
     property string onion
@@ -21,32 +29,49 @@ Opaque.SettingsList { // Add Profile Pane
     property bool changingPassword
 
     function reset() {
-        mode = "add"
+        flickRoot.contentY = 0
+        mode = mode_add
+        reset_errors()
         txtProfileName.text = qsTr("default-profile-name")
         changingPassword = false
         txtPassword1.text = ""
         txtPassword2.text = ""
         deleting = false
-        deleteConfirmLabel.color = "black"
+        deleteConfirmLabel.color = Theme.mainTextColor
-        passwordErrorLabel.visible = false
-        txtCurrentPassword.text = ""
 
+        txtCurrentPassword.text = ""
+        nameLabel.text = ""
+
+        portrait.performTransform = true
+        portrait.source = "core/account_circle-24px_negative_space.svg"
         tag = ""
         confirmDeleteTxt.text = ""
         radioUsePassword.checked = true
-        passwordChangeErrorLabel.visible = false
     }
 
-    function load(userOnion, name, userTag) {
+    function reset_errors() {
+        txtPassword1.error = false
+        txtPassword2.error = false
+        txtCurrentPassword.error = false
+        passwordErrorLabel.visible = false
+        passwordChangeErrorLabel.visible = false
+        confirmDeleteTxt.error = false
+    }
+
+    function load(userOnion, name, userTag, image) {
         reset()
 
-        mode = "edit"
+        mode = mode_edit
         tag = userTag
         onion = userOnion
         txtPassword1.text = ""
         txtPassword2.text = ""
         onionLabel.text = onion
         txtProfileName.text = name
+        nameLabel.text = name
+        portrait.performTransform = false
+        portrait.source = image
+
 
         if (tag == "v1-defaultPassword" || tag == "v1-default-password") {
             radioNoPassword.checked = true
@@ -56,22 +81,101 @@ Opaque.SettingsList { // Add Profile Pane
     }
 
 
-    settings: Column {
+    Opaque.ResponsiveContainer {
+        id: rc
+        width: flickRoot.width
+
+        Rectangle {
+            id: leftCol
+            color: Theme.backgroundPaneColor
+            //height:
+            implicitHeight: leftContents.height
+            height: implicitHeight
+            Layout.fillWidth: true
+            Layout.alignment:  Qt.AlignTop
+
+
+
+            Column {
+                id: leftContents
                 anchors.horizontalCenter: parent.horizontalCenter
-        width: 700
+                Layout.alignment : Qt.AlignHCenter + Qt.AlignTop
+                width: 400 * gcd.themeScale
+                spacing: 10 * gcd.themeScale
 
+                Opaque.ScalingLabel {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    size: Theme.primaryTextSize
 
+                    //: New Profile || Edit Profile
+                    text: mode == mode_add ? qsTr("new-profile") : qsTr("edit-profile")
+                    bold: true
+                }
 
-        Opaque.Setting {
+                // spacing
-            inline: false
+                Rectangle {
-            visible: mode == "edit"
+                    height: 30 * gcd.themeScale
+                    width: 100
+                    color: Theme.backgroundPaneColor
+                }
 
-            //: Onion
+                Opaque.Portrait {
-            label: qsTr("profile-onion-label") + ":"
+                    id: portrait
 
-            field: Opaque.ButtonTextField {
+                    size: 250
+
+                    Layout.preferredHeight: size
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    portraitBorderColor: Theme.portraitOnlineBorderColor
+                    portraitColor: Theme.portraitOnlineBackgroundColor
+                    badgeColor: Theme.portraitProfileBadgeColor
+
+                    performTransform: true
+                    overlayColor: Theme.portraitProfileBadgeTextColor
+
+                    badgeContent: Image {// Profle Type
+                        id: profiletype
+                        source: radioUsePassword.checked ? gcd.assetPath + "/fontawesome/solid/lock.svg" : gcd.assetPath + "/fontawesome/solid/lock-open.svg"
+                        height: 40 * gcd.themeScale
+                        width: height
+                    }
+                }
+
+                Opaque.ScalingLabel {
+                    id: nameLabel
+                    visible: mode == mode_edit
+
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    size: Theme.primaryTextSize
+                    bold: true
+                }
+
+                // spacing
+                Rectangle {
+                    visible: mode == mode_edit
+                    height: 10 * gcd.themeScale
+                    width: 100
+                    color: Theme.backgroundPaneColor
+                }
+
+                Opaque.ScalingLabel {
+                    visible: mode == mode_edit
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    size: Theme.secondaryTextSize
+
+                    //: Send this address to peers you want to connect with
+                    text: qsTr("profile-oniblon-label")
+                }
+
+                Opaque.ButtonTextField {
                     id: onionLabel
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: mode == mode_edit
                     readOnly: true
+
+                    width: leftCol.width - (40*gcd.themeScale)
+
                     button_text: qsTr("copy-btn")
                     dropShadowColor: Theme.dropShadowPaneColor
                     onClicked: {
@@ -79,36 +183,90 @@ Opaque.SettingsList { // Add Profile Pane
                         gcd.popup(qsTr("copied-to-clipboard-notification"))
                         onionLabel.selectAll()
                         onionLabel.copy()
-                }}
+                    }
+                }
+
+                // spacing
+                Rectangle {
+                    visible: radioNoPassword.checked
+                    height: 30 * gcd.themeScale
+                    width: 100
+                    color: Theme.backgroundPaneColor
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: noPasswordLabel.visible ? noPasswordLabel.height : 0
+                    color: leftCol.color
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    Opaque.ScalingLabel {
+                        id: noPasswordLabel
+                        width: parent.width
+                        size: Theme.secondaryTextSize
+                        anchors.horizontalCenter: parent.horizontalCenter
+
+                        //: Not using a password on this account means that all data stored locally will not be encrypted
+                        text: qsTr("no-password-warning")
+                        visible: radioNoPassword.checked
+                    }
+                }
+
+                // spacing
+                Rectangle {
+                    height: 30 * gcd.themeScale
+                    width: 100
+                    color: Theme.backgroundPaneColor
+
+                }
+
             }
 
 
 
-            Opaque.Setting {
+        }
-                inline: false
-                visible: mode == "edit"
 
-                //: Display name
-                label: qsTr("profile-name") + ":"
 
-                field: Opaque.UnderlineTextField {
+
+        Rectangle {
+            id: rightCol
+            color: Theme.backgroundPaneColor
+            anchors.topMargin: 80 * gcd.themeScale
+            height: rightContents.height
+            implicitHeight: height
+            Layout.fillWidth: true
+            Layout.alignment:  Qt.AlignTop
+
+
+
+
+            Column {
+                id: rightContents
+
+                anchors.horizontalCenter: parent.horizontalCenter
+                Layout.alignment : Qt.AlignHCenter + Qt.AlignTop
+                width: 400 * gcd.themeScale
+                spacing: 40 * gcd.themeScale
+
+                Opaque.UnderlineTextField {
                     id: txtProfileName
+                    visible: mode == mode_edit
                     //Layout.fillWidth: true
+                    backgroundColor: Theme.backgroundPaneColor
+                    width: parent.width - (40*gcd.themeScale)
+                    anchors.horizontalCenter: parent.horizontalCenter
 
                     //: default suggested profile name
                     text: qsTr("default-profile-name")
-                    width: parent.width
+
-                }
                 }
 
-
-            Opaque.Setting {
-                inline: false
-                visible:  mode == "add" || tag == "v1-defaultPassword"
-
-                field:
-                ColumnLayout{
                 RowLayout {
+                    visible: (mode == mode_add) || (tag == "v1-defaultPassword")
+
+                    width: parent.width - (40*gcd.themeScale)
+                    anchors.horizontalCenter: parent.horizontalCenter
+
                     //id: radioButtons
 
                     Opaque.RadioButton {
@@ -132,98 +290,114 @@ Opaque.SettingsList { // Add Profile Pane
                     }
                 }
 
-                    Opaque.ScalingLabel {
-                        id: noPasswordLabel
-                        //: Not using a password on this account means that all data stored locally will not be encrypted
-                        text: qsTr("no-password-warning")
-                        visible: radioNoPassword.checked
-                    }
-                }
-            }
 
-            Opaque.Setting{
+                Opaque.UnderlineTextField {
-                inline: false
+                    id: txtCurrentPassword
-                visible: radioUsePassword.checked && mode == "edit" && tag != "v1-defaultPassword"
+                    visible: radioUsePassword.checked && (mode == mode_edit) && tag != "v1-defaultPassword"
 
+                    backgroundColor: Theme.backgroundPaneColor
+
+                    width: parent.width - (40*gcd.themeScale)
+                    anchors.horizontalCenter: parent.horizontalCenter
 
                     //: Current Password
-                label: qsTr("current-password-label") + ":"
+                    placeholderText: qsTr("current-password-label") + ":"
-
-                field: Opaque.TextField {
-                    id: txtCurrentPassword
-                    Layout.fillWidth: true
                     echoMode: TextInput.Password
 
                 }
 
-            }
 
-
+                Opaque.UnderlineTextField {
-            Opaque.Setting {
+                    id: txtPassword1
                     visible: radioUsePassword.checked
 
+                    backgroundColor: Theme.backgroundPaneColor
+
+                    width: parent.width - (40*gcd.themeScale)
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    echoMode: TextInput.Password
+
                     //: Password
-                label:  qsTr("password1-label") + ":"
+                    placeholderText:  qsTr("password1-label")
-
-                field: Opaque.TextField {
-                    id: txtPassword1
-                    Layout.fillWidth: true
-                    //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
-                    echoMode: TextInput.Password
-                    visible: radioUsePassword.checked
 
                     onTextEdited: {
                         changingPassword = true
                     }
                 }
 
-            }
 
-            Opaque.Setting {
+                Opaque.UnderlineTextField {
+                    id: txtPassword2
                     visible: radioUsePassword.checked
 
+                    backgroundColor: Theme.backgroundPaneColor
+
+                    width: parent.width - (40*gcd.themeScale)
+                    anchors.horizontalCenter: parent.horizontalCenter
+
                     //: Reenter password
-                label: qsTr("password2-label") + ":"
+                    placeholderText: qsTr("password2-label")
 
-                field: Opaque.TextField {
-                    id: txtPassword2
-                    Layout.fillWidth: true
-                    //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
                     echoMode: TextInput.Password
-                    visible: radioUsePassword.checked
-                }
-
                 }
 
 
-            Column {
+                Opaque.ScalingLabel {
-                width:parent.width * 0.95
+                    id: passwordErrorLabel
                     anchors.horizontalCenter: parent.horizontalCenter
-                spacing:  10 * gcd.themeScale
+                    size: Theme.secondaryTextSize
+
+                    //: Passwords do not match
+                    text: qsTr("password-error-match")
+                    visible: false
+                    color: Theme.textfieldErrorColor
+                }
+
+                Opaque.ScalingLabel {
+                    id: passwordChangeErrorLabel
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    size: Theme.secondaryTextSize
+
+                    //: Error changing password: Supplied password rejected
+                    text: qsTr("password-change-error")
+                    visible: false
+                    color: Theme.textfieldErrorColor
+                }
+
 
                 Opaque.Button {  // ADD or SAVE button
-                    anchors.right: parent.right
                     height: Theme.primaryTextSize * 1.5
+                    anchors.horizontalCenter: parent.horizontalCenter
 
-                    //: Create Profile || Save Profile
+
-                    text: mode == "add" ? qsTr("create-profile-btn") : qsTr("save-profile-btn")
+                    //: Create || Save
+                    text: mode == mode_add ? qsTr("create-profile-btn") : qsTr("save-profile-btn")
 
                     onClicked: {
-                        if (mode == "add") {
+                        reset_errors()
+                        if (mode == mode_add) {
                             if (txtPassword1.text != txtPassword2.text) {
                                 passwordErrorLabel.visible = true
+                                txtPassword1.error = true
+                                txtPassword2.error = true
                             } else {
                                 gcd.createProfile(txtProfileName.text, radioNoPassword.checked, txtPassword1.text)
                                 gcd.reloadProfileList()
                                 parentStack.pane = parentStack.managementPane
                             }
                         } else {
+                            console.log("Save clicked")
                             gcd.updateNick(onion, txtProfileName.text)
 
                             if (changingPassword) {
+                                console.log("changingPassword")
                                 if (txtPassword1.text != txtPassword2.text) {
                                     passwordErrorLabel.visible = true
+                                    txtPassword1.error = true
+                                    txtPassword2.error = true
                                 } else {
+                                    console.log("gcd.changePassword")
                                     gcd.changePassword(onion, txtCurrentPassword.text, txtPassword1.text, radioNoPassword.checked)
                                 }
                             } else {
@@ -235,38 +409,17 @@ Opaque.SettingsList { // Add Profile Pane
                     }
                 }
 
-                Opaque.ScalingLabel {
-                    id: passwordErrorLabel
-                    //: Passwords do not match
-                    text: qsTr("password-error-match")
-                    visible: false
-                    color: "red"
-                }
-
-                Opaque.ScalingLabel {
-                    id: passwordChangeErrorLabel
-                    //: Error changing password: Supplied password rejected
-                    text: qsTr("password-change-error")
-                    visible: false
-                    color: "red"
-                }
-
-
-
-
                 // ***** Delete button and confirm flow *****
 
 
-
-
-
                 Opaque.Button {
                     anchors.right: parent.right
+                    anchors.rightMargin: 20 * gcd.themeScale
 
                     //: Delete Profile
                     text: qsTr("delete-profile-btn")
-                    icon: "regular/trash-alt"
+                    //icon: "regular/trash-alt"
-                    visible: mode == "edit"
+                    visible: mode == mode_edit
                     height: Theme.primaryTextSize * 1.5
 
 
@@ -277,47 +430,65 @@ Opaque.SettingsList { // Add Profile Pane
 
                 Opaque.ScalingLabel {
                     id: deleteConfirmLabel
+                    size: Theme.secondaryTextSize
+
+                    anchors.right: parent.right
+                    anchors.rightMargin: 20 * gcd.themeScale
+
                     //: Type DELETE to confirm
                     text: qsTr("delete-confirm-label")+ ":"
                     visible: deleting
                 }
 
-                Opaque.TextField {
+                Opaque.UnderlineTextField {
                     id: confirmDeleteTxt
-                    Layout.fillWidth: true
-                    //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 }
                     visible: deleting
+                    backgroundColor: Theme.backgroundPaneColor
+
+                    width: 300 * gcd.themeScale
+                    anchors.right: parent.right
+                    anchors.rightMargin: 20 * gcd.themeScale
+
+                    placeholderText: qsTr("delete-confirm-label")
                 }
 
                 Opaque.Button {
                     id: confirmDeleteBtn
-                    icon: "regular/trash-alt"
+
+                    height: Theme.primaryTextSize * 1.5
+                    anchors.right: parent.right
+                    anchors.rightMargin: 20 * gcd.themeScale
 
                     //: Really Delete Profile
                     text: qsTr("delete-profile-confirm-btn")
-                    color: "red"
                     visible: deleting
 
                     onClicked: {
                         //: DELETE
                         if (confirmDeleteTxt.text == qsTr("delete-confirm-text")) {
-                            deleteConfirmLabel.color = "black"
+                            deleteConfirmLabel.color = Theme.mainTextColor
                             gcd.deleteProfile(onion)
                             gcd.reloadProfileList()
                             parentStack.pane = parentStack.managementPane
                         } else {
-                            deleteConfirmLabel.color = "red"
+                            confirmDeleteTxt.error = true
+                            deleteConfirmLabel.color = Theme.textfieldErrorColor
                         }
 
                     }
                 }
+
+                // spacing
+                Rectangle {
+                    height: 30 * gcd.themeScale
+                    width: 100
+                    color: Theme.backgroundPaneColor
+                }
+            }
         }
 
 
-        }//end of column
+        Connections {
-
-
-        Connections { // UPDATE UNREAD MESSAGES COUNTER
             target: gcd
 
             onChangePasswordResponse: function(error) {
@@ -326,7 +497,9 @@ Opaque.SettingsList { // Add Profile Pane
                     parentStack.pane = parentStack.managementPane
                 } else {
                     passwordChangeErrorLabel.visible = true
+                    txtCurrentPassword.error = true
                 }
             }
         }
     }
+}

qml/panes/ProfileManagerPane.qml

@@ -28,7 +28,6 @@ ColumnLayout {
         wrapMode: TextEdit.Wrap
         size: Theme.primaryTextSize
 
-
         font.family: Fonts.applicationFontRegular.name
         font.styleName: "Bold"
 
@@ -112,6 +111,8 @@ ColumnLayout {
                 size: Theme.primaryTextSize
                 font.family: Fonts.applicationFontRegular.name
                 font.styleName: "Bold"
+                anchors.left: parent.left
+                anchors.leftMargin: 25 * gcd.themeScale
 
                 //: Your Profiles
                 text: qsTr("your-profiles")
@@ -136,6 +137,8 @@ ColumnLayout {
                 size: Theme.primaryTextSize
                 font.family: Fonts.applicationFontRegular.name
                 font.styleName: "Bold"
+                anchors.left: parent.left
+                anchors.leftMargin: 25 * gcd.themeScale
 
                 //: Your Profiles
                 text: qsTr("your-servers")

qml/panes/SettingsPane.qml

@@ -14,6 +14,7 @@ import "../opaque/theme"
 Opaque.SettingsList { // settingsPane
     id: root
     anchors.fill: parent
+    anchors.topMargin: 20
 
     settings: Column {
         anchors.horizontalCenter: parent.horizontalCenter

qml/widgets/ProfileRow.qml

@@ -46,7 +46,7 @@ Opaque.PortraitRow {
         size: parent.height * 0.5
 
         onClicked: {
-            profileAddEditPane.load(handle, displayName, tag)
+            profileAddEditPane.load(handle, displayName, tag, image)
             parentStack.pane = parentStack.addEditProfilePane
         }