diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb3581468fc6e80dfbbd67c35b15c9312557e8f2..61765eb991b436346edb375b78042951ce1ac024 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ IF(POLICY CMP0022)
   CMAKE_POLICY(SET CMP0022 NEW)
 ENDIF(POLICY CMP0022)
 
-SET(PROJ_NAME Ring)
+SET(PROJ_NAME Jami)
 option(RELEASE_TYPE "RELEASE_TYPE" "website")
 
 # To build nighlies we need to update RING_VERSION with an optional command line arg
@@ -454,7 +454,7 @@ IF("${RELEASE_TYPE}" STREQUAL "AppStore")
     SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES
         MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in
         MACOSX_BUNDLE_GUI_IDENTIFIER "com.savoirfairelinux.ring.macos"
-        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/data/Ring.entitlements"
+        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/data/Jami.entitlements"
         MACOSX_BUNDLE_SHORT_VERSION_STRING "${RING_VERSION_NAME}"
         MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJ_NAME} ${RING_VERSION_NAME}"
         MACOSX_BUNDLE_BUNDLE_VERSION ${RING_VERSION}
diff --git a/Credits.rtf b/Credits.rtf
index 039cbaa1c6b21927a2ec6cce0c3b4e223b174343..d10f42f6a880090635f6df22c6bc198520b150c6 100644
--- a/Credits.rtf
+++ b/Credits.rtf
@@ -1,5 +1,6 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf100
+{\fonttbl\f0\fswiss\fcharset0 Helvetica-Oblique;\f1\fswiss\fcharset0 Helvetica-BoldOblique;\f2\fswiss\fcharset0 Helvetica-Bold;
+}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
 \margl1440\margr1440\vieww9000\viewh8400\viewkind0
@@ -8,16 +9,16 @@
 \f0\i\fs24 \cf0 \
 
 \fs28 "
-\b Live Free or Die"
-\b0\fs24 \
+\f1\b Live Free or Die"
+\f0\b0\fs24 \
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "https://ring.cx/"}}{\fldrslt \cf0 https://ring.cx/}}\
+{\field{\*\fldinst{HYPERLINK "https://ring.cx/"}}{\fldrslt \cf0 jami.net}}\
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc\partightenfactor0
 
-\i0\b \cf0 Authors
-\i\b0 \
+\f2\i0\b \cf0 Authors
+\f0\i\b0 \
 Adrien B\'e9raud\
 Alexandr Sergheev\
 Aline Bonnet\
@@ -58,8 +59,8 @@ Thibault Wittemberg\
 Based on SFLphone's project\
 \
 
-\i0\b Translated by
-\i\b0 \
+\f2\i0\b Translated by
+\f0\i\b0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://www.transifex.com/savoirfairelinux/ring/"}}{\fldrslt \cf0 https://www.transifex.com/savoirfairelinux/ring/}}\
 }
\ No newline at end of file
diff --git a/cmake/MacOSXBundleInfo.plist.in b/cmake/MacOSXBundleInfo.plist.in
index 6e377eb0c2f8af96fd8ef149b7a5e96c07e67222..5e30e24f955df55ec85ab9840c42542f3c247f0c 100644
--- a/cmake/MacOSXBundleInfo.plist.in
+++ b/cmake/MacOSXBundleInfo.plist.in
@@ -47,11 +47,11 @@
     <key>NSPrincipalClass</key>
     <string>${MACOSX_BUNDLE_NSPRINCIPAL_CLASS}</string>
     <key>NSCameraUsageDescription</key>
-    <string>Ring requires to access your camera to make calls and record video</string>
+    <string>Jami requires to access your camera to make calls and record video</string>
     <key>NSMicrophoneUsageDescription</key>
-    <string>Ring requires to access your microphone to make calls and record audio</string>
+    <string>Jami requires to access your microphone to make calls and record audio</string>
     <key>NSPhotoLibraryUsageDescription</key>
-    <string>Ring requires to access your photo library to show image on profile and send via chat</string>
+    <string>Jami requires to access your photo library to show image on profile and send via chat</string>
     <key>CFBundleURLTypes</key>
         <array>
         <dict>
diff --git a/data/Ring.entitlements b/data/Jami.entitlements
similarity index 100%
rename from data/Ring.entitlements
rename to data/Jami.entitlements
diff --git a/data/appicon.icns b/data/appicon.icns
index 041ee300753385b1477de4996776301d5899ec68..8e06b71450457676b3a1175022d1fa41fabe0a0a 100644
Binary files a/data/appicon.icns and b/data/appicon.icns differ
diff --git a/data/symbol_blue.png b/data/symbol_blue.png
index caca1daf6f48997b07525c22ffce6783379b9723..1eea3a77c86604c7c1a635d2c7340d56cf503351 100644
Binary files a/data/symbol_blue.png and b/data/symbol_blue.png differ
diff --git a/data/symbol_name.png b/data/symbol_name.png
old mode 100755
new mode 100644
index 9e2e583dc0ebbd5d651b51edc1d611d5b6c82b1f..febe905fbe8ae28c4971baf8555a9dca63366c2d
Binary files a/data/symbol_name.png and b/data/symbol_name.png differ
diff --git a/signAndDeploy.sh b/signAndDeploy.sh
index c45b4ca7d9a5d22b6d153dde2f425d58bddd88be..c28e3d204287cd4355ec480eaed507b08d659bfe 100755
--- a/signAndDeploy.sh
+++ b/signAndDeploy.sh
@@ -14,11 +14,11 @@ security import certificates/certificates/distribution/Certificates.p12 -k $KEYC
 DELIVER_PASSWORD=$APPLE_PASSWORD fastlane sigh --app_identifier $BUNDLE_ID --username $APPLE_ACCOUNT --readonly true --platform macos --team_id $TEAM_ID
 security set-key-partition-list -S apple-tool:,apple:,productbuild: -s -k $KEYCHAIN_PASSWORD $KEYCHAIN_NAME > /dev/null 2>&1
 echo "start signing"
-macdeployqt ./Ring.app -codesign="${APP_CERTIFICATE}"
-codesign --force --sign "${APP_CERTIFICATE}" --entitlements ../data/Ring.entitlements Ring.app
-codesign --verify Ring.app
+macdeployqt ./Jami.app -codesign="${APP_CERTIFICATE}"
+codesign --force --sign "${APP_CERTIFICATE}" --entitlements ../data/Jami.entitlements Jami.app
+codesign --verify Jami.app
 echo "create .pkg"
-productbuild --component Ring.app/ /Applications --sign "${INSTALLER_CERTIFICATE}" --product Ring.app/Contents/Info.plist Ring.pkg
-/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --validate-app  --type osx -f Ring.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
+productbuild --component Jami.app/ /Applications --sign "${INSTALLER_CERTIFICATE}" --product Jami.app/Contents/Info.plist Jami.pkg
+/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --validate-app  --type osx -f Jami.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
 echo "start deploying"
-/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --upload-app  --type osx -f Ring.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
+/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --upload-app  --type osx -f Jami.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm
index d6d43c70d2ed6780341df6b9caeee7faa2cfadec..cee31395d2564a4c0b29ca0b7458eb0faab71a63 100644
--- a/src/AppDelegate.mm
+++ b/src/AppDelegate.mm
@@ -87,6 +87,13 @@ std::unique_ptr<lrc::api::Lrc> lrc;
 
     NSAppleEventManager* appleEventManager = [NSAppleEventManager sharedAppleEventManager];
     [appleEventManager setEventHandler:self andSelector:@selector(handleQuitEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEQuitApplication];
+
+    dispatch_queue_t queue = NULL;
+    queue = dispatch_queue_create("scNetworkReachability", DISPATCH_QUEUE_SERIAL);
+    [self setScNetworkQueue:queue];
+    [self beginObservingReachabilityStatus];
+    NSActivityOptions options = NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled | NSActivityBackground;
+    self.activity = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"Receiving calls and messages"];
     lrc = std::make_unique<lrc::api::Lrc>();
 
     if([self checkForRingAccount]) {
@@ -95,13 +102,6 @@ std::unique_ptr<lrc::api::Lrc> lrc;
         [self showWizard];
     }
     [self connect];
-
-    dispatch_queue_t queue = NULL;
-    queue = dispatch_queue_create("scNetworkReachability", DISPATCH_QUEUE_SERIAL);
-    [self setScNetworkQueue:queue];
-    [self beginObservingReachabilityStatus];
-    NSActivityOptions options = NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled | NSActivityBackground;
-    self.activity = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"Receiving calls and messages"];
 }
 
 - (void) beginObservingReachabilityStatus
diff --git a/src/ChooseAccountVC.mm b/src/ChooseAccountVC.mm
index 4188a0c04461556911536ba9bcd206920259e35f..475343583a6e9297a280b6cbdc03432a274645c5 100644
--- a/src/ChooseAccountVC.mm
+++ b/src/ChooseAccountVC.mm
@@ -230,7 +230,7 @@ NSMutableDictionary* menuItemsTags;
             [itemView.accountTypeLabel setStringValue:@"SIP"];
             break;
         case lrc::api::profile::Type::RING:
-            [itemView.accountTypeLabel setStringValue:@"RING"];
+            [itemView.accountTypeLabel setStringValue:@"Jami"];
             break;
         default:
             break;
diff --git a/src/ExportPasswordWC.mm b/src/ExportPasswordWC.mm
index 2d2cf0ac4653404f82aa26944873cd88003a6fd8..0921af8e31350cbda645b2d23e6052a0fc4fa6dd 100644
--- a/src/ExportPasswordWC.mm
+++ b/src/ExportPasswordWC.mm
@@ -118,7 +118,7 @@ QMetaObject::Connection accountConnection;
 
     [thePin addAttributes:[NSDictionary dictionaryWithObject:mutParaStyle forKey:NSParagraphStyleAttributeName] range:range];
 
-    NSMutableAttributedString* infos = [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.","Title shown to user to concat with Pin")];
+    NSMutableAttributedString* infos = [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.","Title shown to user to concat with Pin")];
     [thePin appendAttributedString:infos];
     [thePin endEditing];
 
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 9d0f1d5d39f55770d134bcd2606c9422cdc66223..971622e4f0c8c714410e17b273caa32793a8ebbf 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -76,6 +76,7 @@ typedef NS_ENUM(NSInteger, ViewState) {
     __unsafe_unretained IBOutlet NSView* welcomeContainer;
     __unsafe_unretained IBOutlet NSView* callView;
     __unsafe_unretained IBOutlet NSTextField* ringIDLabel;
+    __unsafe_unretained IBOutlet NSTextField* explanationLabel;
     __unsafe_unretained IBOutlet NSButton* shareButton;
     __unsafe_unretained IBOutlet NSImageView* qrcodeView;
 
@@ -291,8 +292,10 @@ NSString* const kOpenAccountToolBarItemIdentifier    = @"OpenAccountToolBarItemI
         NSString* uriToDisplay = nullptr;
         if (!registeredName.empty()) {
             uriToDisplay = @(registeredName.c_str());
+            [explanationLabel setStringValue: NSLocalizedString(@"This is your Jami username. \nCopy and share it with your friends!", @"Explanation label when user have Jami username")];
         } else {
             uriToDisplay = @(ringID.c_str());
+            [explanationLabel setStringValue: NSLocalizedString(@"This is your ID. \nCopy and share it with your friends!", @"Explanation label when user have just ID")];
         }
         [ringIDLabel setStringValue:uriToDisplay];
         [self drawQRCode:@(ringID.c_str())];
@@ -316,8 +319,9 @@ NSString* const kOpenAccountToolBarItemIdentifier    = @"OpenAccountToolBarItemI
 
 - (IBAction)toggleQRCode:(id)sender {
     // Toggle pressed state of QRCode button
-    [sender setPressed:![sender isPressed]];
-    [self showQRCode:[sender isPressed]];
+  //  [sender setPressed:![sender isPressed]];
+    bool show = qrcodeView.animator.alphaValue == 0.0f ? YES: NO;
+    [self showQRCode: show];
 }
 
 /**
diff --git a/src/RingWizardWC.mm b/src/RingWizardWC.mm
index d77bde82ab3d212c2b935d6534805429a325fcbd..d20836e139639a3f224f06ae5f2832766f0440f2 100644
--- a/src/RingWizardWC.mm
+++ b/src/RingWizardWC.mm
@@ -114,7 +114,7 @@
 }
 
 - (void)showChooseWithCancelButton:(BOOL)showCancel andAdvanced:(BOOL)showAdvanced {
-    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Ring",
+    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Jami",
                                                         @"Welcome title")];
     [ringImage setHidden: NO];
     titleConstraint.constant = -26.5;
@@ -129,7 +129,7 @@
 
 - (void)showChooseWithCancelButton:(BOOL)showCancel
 {
-    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Ring",
+    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Jami",
                                                          @"Welcome title")];
     [ringImage setHidden: NO];
     titleConstraint.constant = -26.5;
diff --git a/ui/Base.lproj/ExportPasswordWindow.strings b/ui/Base.lproj/ExportPasswordWindow.strings
index 294984d8abf4b95cf146929cb8e219647e26296c..c4b3f8d6d242be6d4ae89756d80e3603a0650952 100644
--- a/ui/Base.lproj/ExportPasswordWindow.strings
+++ b/ui/Base.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+/* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "Please provide your password to start";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Window";
diff --git a/ui/Base.lproj/ExportPasswordWindow.xib b/ui/Base.lproj/ExportPasswordWindow.xib
index 36d8700386c398f9625f239e7963307042fdd1f4..174941482fadc455abedc9c9077732d44922d407 100644
--- a/ui/Base.lproj/ExportPasswordWindow.xib
+++ b/ui/Base.lproj/ExportPasswordWindow.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="ExportPasswordWC">
@@ -21,7 +20,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="410" height="161"/>
@@ -33,7 +32,7 @@
                     <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ty1-sj-tT6">
                         <rect key="frame" x="15" y="0.0" width="380" height="151"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
                                 <rect key="frame" x="-2" y="78" width="384" height="40"/>
                                 <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" placeholderString="error label" id="e7n-Ev-bK7">
                                     <font key="font" metaFont="system"/>
@@ -79,7 +78,7 @@ DQ
                                     <action selector="cancelPressed:" target="-2" id="NWs-SH-M68"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M0M-Fg-Znl">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="M0M-Fg-Znl">
                                 <rect key="frame" x="-2" y="44" width="384" height="107"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="107" id="egH-qZ-wBG"/>
@@ -118,7 +117,7 @@ DQ
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="xUT-yB-g8Q">
                         <rect key="frame" x="15" y="0.0" width="380" height="151"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
                                 <rect key="frame" x="50" y="68" width="63" height="17"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="vwh-K9-3O9">
                                     <font key="font" metaFont="system"/>
@@ -126,11 +125,11 @@ DQ
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <secureTextField verticalHuggingPriority="750" ambiguous="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
+                            <secureTextField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
                                 <rect key="frame" x="118" y="65" width="210" height="22"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." drawsBackground="YES" usesSingleLineMode="YES" id="xqz-Uz-hqU">
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <allowedInputSourceLocales>
                                         <string>NSAllRomanInputSourcesLocaleIdentifier</string>
@@ -149,7 +148,7 @@ DQ
                                     <outlet property="delegate" destination="-2" id="UEj-AI-SPU"/>
                                 </connections>
                             </secureTextField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YR8-e7-f8B">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YR8-e7-f8B">
                                 <rect key="frame" x="18" y="126" width="231" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="227" id="6Fn-hi-Ji3"/>
@@ -173,12 +172,12 @@ DQ
                                     <action selector="completeAction:" target="-2" id="4me-jZ-4mk"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qx0-KE-jEl">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Qx0-KE-jEl">
                                 <rect key="frame" x="18" y="104" width="344" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="14" id="g34-vr-Zas"/>
                                 </constraints>
-                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" title="Please provide your Ring account password to start" id="859-10-HEb">
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" title="Please provide your password to start" id="859-10-HEb">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/GeneralPrefs.strings b/ui/Base.lproj/GeneralPrefs.strings
index 64e43ce5c34f8b5918fdf1dbc4636f236dea3db8..ba22e9744452d0719488278528b3ea159049174a 100644
--- a/ui/Base.lproj/GeneralPrefs.strings
+++ b/ui/Base.lproj/GeneralPrefs.strings
@@ -47,8 +47,8 @@
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming calls"; ObjectID = "uCL-ye-tsv"; */
 "uCL-ye-tsv.title" = "Enable notifications for incoming calls";
 
-/* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
-"uYI-hA-JHk.title" = "Bring Ring to foreground on incoming calls";
+/* Class = "NSButtonCell"; title = "Bring Jami to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
+"uYI-hA-JHk.title" = "Bring Jami to foreground on incoming calls";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "This is shared with your contacts ";
diff --git a/ui/Base.lproj/GeneralPrefs.xib b/ui/Base.lproj/GeneralPrefs.xib
index 3b015d3d3ef832561b248968b3ed6b7c92ff58ed..a157b149d1e42f75c146a6d8c8f9bd9d5c8c13c7 100644
--- a/ui/Base.lproj/GeneralPrefs.xib
+++ b/ui/Base.lproj/GeneralPrefs.xib
@@ -136,8 +136,11 @@
                     </constraints>
                 </customView>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="Is4-pD-LOT">
-                    <rect key="frame" x="38" y="162" width="280" height="18"/>
-                    <buttonCell key="cell" type="check" title="Bring Ring to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
+                    <rect key="frame" x="56" y="237" width="423" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="419" id="iUi-lt-J9M"/>
+                    </constraints>
+                    <buttonCell key="cell" type="check" title="Bring Jami to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
diff --git a/ui/Base.lproj/Localizable.strings b/ui/Base.lproj/Localizable.strings
index 04c0cdf29b5733e21f153fea98cdb6d18c857377..47ddd4865c2b9370fcc6fec46fe337ef21d57f10 100644
--- a/ui/Base.lproj/Localizable.strings
+++ b/ui/Base.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copy number";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -132,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -153,16 +153,16 @@
 "The entered username is not available" = "The entered username is not available";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+"The following account needs to be migrated to the new Jami account format:" = "The following account needs to be migrated to the new Jami account format:";
 
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "The password you entered does not unlock this account";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Unknown";
@@ -183,10 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Create a new account";
 "Add a SIP account" = "Add a SIP account";
 
 /* Notification message */
 "Send you a contact request" = "Send you a contact request";
 
+/* Explanation label when user have Jami username */
+"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
+
+/* Explanation label when user have just ID */
+"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";
diff --git a/ui/Base.lproj/MainMenu.strings b/ui/Base.lproj/MainMenu.strings
index 632731da22374d8a451bd9b69c64da2af24c4e2e..2f85d9cce17a5b670bcccc91afa45c43b204cd5f 100644
--- a/ui/Base.lproj/MainMenu.strings
+++ b/ui/Base.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Ring";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Ring";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "About Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferences…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Services";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Hide Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Quit Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Hide Others";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Help";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring Help";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Find and Replace…";
diff --git a/ui/Base.lproj/MainMenu.xib b/ui/Base.lproj/MainMenu.xib
index 7e04eec973718dc306d058bf961c3586fcc4be5a..66f2947a5ff3a92a63b15d901a0fd592bb88229b 100644
--- a/ui/Base.lproj/MainMenu.xib
+++ b/ui/Base.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="RingWindowController">
@@ -13,10 +13,10 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
-                <menuItem title="Ring" id="56">
-                    <menu key="submenu" title="Ring" systemMenu="apple" id="57">
+                <menuItem title="Jami" id="56">
+                    <menu key="submenu" title="Jami" systemMenu="apple" id="57">
                         <items>
-                            <menuItem title="About Ring" id="58">
+                            <menuItem title="About Jami" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
@@ -45,7 +45,7 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide Ring" keyEquivalent="h" id="134">
+                            <menuItem title="Hide Jami" keyEquivalent="h" id="134">
                                 <connections>
                                     <action selector="hide:" target="-1" id="367"/>
                                 </connections>
@@ -64,7 +64,7 @@
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit Ring" keyEquivalent="q" id="136">
+                            <menuItem title="Quit Jami" keyEquivalent="q" id="136">
                                 <connections>
                                     <action selector="terminate:" target="-3" id="449"/>
                                 </connections>
@@ -324,7 +324,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="Ring Help" keyEquivalent="?" id="492">
+                            <menuItem title="Jami Help" keyEquivalent="?" id="492">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="493"/>
                                 </connections>
diff --git a/ui/Base.lproj/MigrateRingAccountsWindow.strings b/ui/Base.lproj/MigrateRingAccountsWindow.strings
index fceda8a3ec344623c2ab7c32b9dffd26f63061eb..e4f2a5b0003dca37074b59a5d1ba10fdf9221b05 100644
--- a/ui/Base.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/Base.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Account migration completed";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "RingID";
+/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If your not ready to choose a password, you may close Jami and resume the migration later.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Account migration error";
diff --git a/ui/Base.lproj/MigrateRingAccountsWindow.xib b/ui/Base.lproj/MigrateRingAccountsWindow.xib
index 3cebb717f11a00ba353ae1f321ad9da067345fa5..5e93fbcb779577ce94c4de2c8b6fc2f6130d6dcf 100644
--- a/ui/Base.lproj/MigrateRingAccountsWindow.xib
+++ b/ui/Base.lproj/MigrateRingAccountsWindow.xib
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MigrateRingAccountsWC">
@@ -21,7 +21,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="508" height="296"/>
@@ -45,16 +45,16 @@
                                 <rect key="frame" x="-2" y="144" width="472" height="85"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" placeholderString="RingID" id="859-10-HEb">
                                     <font key="font" metaFont="system"/>
-                                    <string key="title">The following account needs to be migrated to the new Ring account format:\n Alias : \nID:\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.</string>
+                                    <string key="title">The following account needs to be migrated to the new Jami account format:\n Alias : \nID:\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If your not ready to choose a password, you may close Jami and resume the migration later.</string>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
                             <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
-                                <rect key="frame" x="105" y="105" width="243" height="22"/>
+                                <rect key="frame" x="105" y="105" width="244" height="22"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." drawsBackground="YES" usesSingleLineMode="YES" id="xqz-Uz-hqU">
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <allowedInputSourceLocales>
                                         <string>NSAllRomanInputSourcesLocaleIdentifier</string>
@@ -101,10 +101,10 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fb6-6f-oqD" userLabel="Password confirmation">
-                                <rect key="frame" x="105" y="62" width="243" height="22"/>
+                                <rect key="frame" x="105" y="62" width="244" height="22"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Confirm your new password..." drawsBackground="YES" usesSingleLineMode="YES" id="KuO-oT-zhY">
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <allowedInputSourceLocales>
                                         <string>NSAllRomanInputSourcesLocaleIdentifier</string>
diff --git a/ui/Base.lproj/PersonLinker.xib b/ui/Base.lproj/PersonLinker.xib
new file mode 100644
index 0000000000000000000000000000000000000000..bb5d5bf709e97775f6f5e13a11a762c25f0a3473
--- /dev/null
+++ b/ui/Base.lproj/PersonLinker.xib
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="PersonLinkerVC">
+            <connections>
+                <outlet property="addCloudContactMsg" destination="TQq-By-akw" id="P1I-KU-vMh"/>
+                <outlet property="categoryComboBox" destination="MFf-kv-pz3" id="a2g-cf-dcv"/>
+                <outlet property="contactMethodLabel" destination="8pP-Sy-Vkd" id="UGZ-bY-lDO"/>
+                <outlet property="createContactSubview" destination="6M0-sm-haN" id="Ba5-9R-6fh"/>
+                <outlet property="createNewContactButton" destination="N0T-7S-TCW" id="MUz-ox-g0t"/>
+                <outlet property="firstNameField" destination="m4N-gI-w8E" id="qeh-cD-nEA"/>
+                <outlet property="lastNameField" destination="j0A-7O-Bvj" id="CcY-4A-Epn"/>
+                <outlet property="linkToExistingSubview" destination="4Dh-2q-0Sm" id="CMO-kR-mHc"/>
+                <outlet property="personsView" destination="eKe-7i-c79" id="oAv-Y3-gon"/>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="308" height="452"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8pP-Sy-Vkd">
+                    <rect key="frame" x="18" y="415" width="184" height="22"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" alignment="right" placeholderString="Contact Method" usesSingleLineMode="YES" id="a9R-r5-K3w">
+                        <font key="font" size="18" name="HelveticaNeue-Thin"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Dh-2q-0Sm">
+                    <rect key="frame" x="0.0" y="-21" width="308" height="428"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <subviews>
+                        <searchField wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZJY-k3-gHh">
+                            <rect key="frame" x="20" y="406" width="268" height="22"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="sS1-2Z-ZWi">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </searchFieldCell>
+                            <connections>
+                                <outlet property="delegate" destination="-2" id="XVp-Zj-wcV"/>
+                                <outlet property="nextKeyView" destination="eKe-7i-c79" id="7Oc-g3-Xrb"/>
+                            </connections>
+                        </searchField>
+                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cfj-u3-ErF">
+                            <rect key="frame" x="9" y="24" width="291" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="squareTextured" title="Add new contact" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="had-9Y-eza">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="presentNewContactForm:" target="-2" id="GOU-Lc-s5y"/>
+                                <outlet property="nextKeyView" destination="MFf-kv-pz3" id="ptg-Li-e6T"/>
+                            </connections>
+                        </button>
+                        <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="42" horizontalPageScroll="10" verticalLineScroll="42" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" scrollerKnobStyle="light" translatesAutoresizingMaskIntoConstraints="NO" id="sue-LK-DlA">
+                            <rect key="frame" x="0.0" y="61" width="308" height="337"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="bpD-gC-mEn">
+                                <rect key="frame" x="0.0" y="0.0" width="308" height="337"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <subviews>
+                                    <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="40" viewBased="YES" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="02n-X5-Zug" id="eKe-7i-c79">
+                                        <rect key="frame" x="0.0" y="0.0" width="308" height="337"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <size key="intercellSpacing" width="3" height="2"/>
+                                        <color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/>
+                                        <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                        <tableColumns>
+                                            <tableColumn identifier="NameColumn" width="305" minWidth="40" maxWidth="1000" id="02n-X5-Zug">
+                                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                </tableHeaderCell>
+                                                <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="M4f-N4-msh">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                                <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                <prototypeCellViews>
+                                                    <tableCellView identifier="MainCell" wantsLayer="YES" id="nIU-iD-8vh">
+                                                        <rect key="frame" x="1" y="1" width="305" height="60"/>
+                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                        <subviews>
+                                                            <textField wantsLayer="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vix-1z-ceH">
+                                                                <rect key="frame" x="60" y="20" width="219" height="23"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="Jcn-cg-rbR">
+                                                                    <font key="font" size="16" name="HelveticaNeue-Light"/>
+                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="XdL-zf-7dn">
+                                                                <rect key="frame" x="10" y="11" width="40" height="40"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="27s-no-TQR"/>
+                                                            </imageView>
+                                                        </subviews>
+                                                        <connections>
+                                                            <outlet property="textField" destination="Vix-1z-ceH" id="Abp-mU-zH1"/>
+                                                        </connections>
+                                                    </tableCellView>
+                                                </prototypeCellViews>
+                                            </tableColumn>
+                                        </tableColumns>
+                                        <connections>
+                                            <outlet property="delegate" destination="-2" id="4Ls-yd-9gL"/>
+                                            <outlet property="nextKeyView" destination="cfj-u3-ErF" id="oex-MO-dfb"/>
+                                        </connections>
+                                    </outlineView>
+                                </subviews>
+                            </clipView>
+                            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="4Sk-mY-PsD">
+                                <rect key="frame" x="1" y="117" width="238" height="16"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                            </scroller>
+                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="awN-qf-qb2">
+                                <rect key="frame" x="-16" y="0.0" width="16" height="0.0"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                            </scroller>
+                        </scrollView>
+                    </subviews>
+                </customView>
+                <comboBox verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MFf-kv-pz3">
+                    <rect key="frame" x="208" y="415" width="84" height="26"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" usesDataSource="YES" numberOfVisibleItems="5" id="Msw-lx-k0J">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </comboBoxCell>
+                    <connections>
+                        <outlet property="dataSource" destination="-2" id="tJu-f2-MiR"/>
+                        <outlet property="delegate" destination="-2" id="WaI-jK-1gz"/>
+                        <outlet property="nextKeyView" destination="ZJY-k3-gHh" id="tEx-0T-BlC"/>
+                    </connections>
+                </comboBox>
+            </subviews>
+            <point key="canvasLocation" x="578" y="354"/>
+        </customView>
+        <customView wantsLayer="YES" id="6M0-sm-haN">
+            <rect key="frame" x="0.0" y="0.0" width="272" height="216"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m4N-gI-w8E">
+                    <rect key="frame" x="13" y="107" width="245" height="22"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="245" id="iPe-jW-Wlk"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="First name..." drawsBackground="YES" id="vyb-95-XaF">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <outlet property="delegate" destination="-2" id="CCw-aR-pcT"/>
+                        <outlet property="nextKeyView" destination="j0A-7O-Bvj" id="Ub8-NO-TRg"/>
+                    </connections>
+                </textField>
+                <textField verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-7O-Bvj">
+                    <rect key="frame" x="13" y="75" width="245" height="22"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="245" id="gH8-eW-ktF"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Last name..." drawsBackground="YES" id="cGT-nu-sPa">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <outlet property="delegate" destination="-2" id="C7b-2i-RVK"/>
+                        <outlet property="nextKeyView" destination="N0T-7S-TCW" id="DHp-cl-011"/>
+                    </connections>
+                </textField>
+                <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GgO-mM-nnz">
+                    <rect key="frame" x="74" y="192" width="125" height="24"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="New Contact" id="v7b-de-MVd">
+                        <font key="font" metaFont="system" size="20"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <scrollView misplaced="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzn-cW-Vtm">
+                    <rect key="frame" x="27" y="137" width="217" height="41"/>
+                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2yu-GN-mus">
+                        <rect key="frame" x="0.0" y="0.0" width="217" height="41"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="TQq-By-akw">
+                                <rect key="frame" x="0.0" y="0.0" width="217" height="41"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                <size key="minSize" width="217" height="41"/>
+                                <size key="maxSize" width="463" height="10000000"/>
+                                <attributedString key="textStorage">
+                                    <fragment content="This contact will be added to your iCloud contacts ">
+                                        <attributes>
+                                            <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                            <font key="NSFont" metaFont="smallSystem"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                                <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            </textView>
+                        </subviews>
+                    </clipView>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="41" id="evf-4R-Uy9"/>
+                        <constraint firstAttribute="width" constant="217" id="rLb-RB-QaL"/>
+                    </constraints>
+                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="XUh-Co-vZc">
+                        <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                    <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="C83-CS-odD">
+                        <rect key="frame" x="201" y="0.0" width="16" height="41"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </scroller>
+                </scrollView>
+                <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="N0T-7S-TCW">
+                    <rect key="frame" x="95" y="38" width="81" height="25"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="gX5-8a-8bp"/>
+                    </constraints>
+                    <buttonCell key="cell" type="squareTextured" title="Create" bezelStyle="texturedSquare" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="qZc-Z2-TpP">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="createContact:" target="-2" id="zAV-BX-EwU"/>
+                        <outlet property="nextKeyView" destination="m4N-gI-w8E" id="Q27-eZ-3aK"/>
+                    </connections>
+                </button>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="centerX" secondItem="m4N-gI-w8E" secondAttribute="centerX" id="4IS-12-aeP"/>
+                <constraint firstItem="N0T-7S-TCW" firstAttribute="top" secondItem="j0A-7O-Bvj" secondAttribute="bottom" constant="13" id="FM4-Ux-d1v"/>
+                <constraint firstAttribute="centerX" secondItem="j0A-7O-Bvj" secondAttribute="centerX" id="JAP-Mr-JWl"/>
+                <constraint firstItem="vzn-cW-Vtm" firstAttribute="top" secondItem="GgO-mM-nnz" secondAttribute="bottom" constant="14" id="RXK-45-m86"/>
+                <constraint firstItem="N0T-7S-TCW" firstAttribute="centerX" secondItem="6M0-sm-haN" secondAttribute="centerX" id="bFE-4h-t1h"/>
+                <constraint firstItem="GgO-mM-nnz" firstAttribute="top" secondItem="6M0-sm-haN" secondAttribute="top" id="ev3-6v-7uJ"/>
+                <constraint firstAttribute="centerX" secondItem="vzn-cW-Vtm" secondAttribute="centerX" id="ltD-l2-ESu"/>
+                <constraint firstItem="j0A-7O-Bvj" firstAttribute="top" secondItem="m4N-gI-w8E" secondAttribute="bottom" constant="10" id="oZj-eA-5pT"/>
+                <constraint firstItem="m4N-gI-w8E" firstAttribute="top" secondItem="vzn-cW-Vtm" secondAttribute="bottom" constant="8" id="teN-U3-diI"/>
+                <constraint firstAttribute="centerX" secondItem="GgO-mM-nnz" secondAttribute="centerX" id="zLf-OH-9nF"/>
+            </constraints>
+            <point key="canvasLocation" x="949" y="317"/>
+        </customView>
+    </objects>
+</document>
diff --git a/ui/Base.lproj/PreferencesWindow.strings b/ui/Base.lproj/PreferencesWindow.strings
index 70cfcddef7732dd7769c8f9f925472daf83f6050..1e0bb88afe00477423c850d12652304a40397640 100644
--- a/ui/Base.lproj/PreferencesWindow.strings
+++ b/ui/Base.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Preferences";
+/* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Jami Preferences";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "General";
diff --git a/ui/Base.lproj/PreferencesWindow.xib b/ui/Base.lproj/PreferencesWindow.xib
index dce592f2007dd8045b3e1352df1995c07ce289ba..9b745b338b6dca7e136c9928a2202e2d898c107b 100644
--- a/ui/Base.lproj/PreferencesWindow.xib
+++ b/ui/Base.lproj/PreferencesWindow.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,13 +13,13 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Ring Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" showsToolbarButton="NO" animationBehavior="default" id="C1T-wE-wxb">
+        <window title="Jami Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" animationBehavior="default" id="C1T-wE-wxb">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <rect key="contentRect" x="469" y="334" width="653" height="383"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <view key="contentView" id="33Y-I6-Ofh">
                 <rect key="frame" x="0.0" y="0.0" width="653" height="383"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="pWP-Wb-B2n">
                         <rect key="frame" x="0.0" y="0.0" width="653" height="383"/>
@@ -70,7 +70,7 @@
         </window>
     </objects>
     <resources>
-        <image name="NSAdvanced" width="32" height="32"/>
+        <image name="NSAdvanced" width="128" height="128"/>
         <image name="audio" width="36" height="36"/>
         <image name="general" width="36" height="36"/>
         <image name="video" width="36" height="36"/>
diff --git a/ui/Base.lproj/RegisterNameWindow.strings b/ui/Base.lproj/RegisterNameWindow.strings
index fe7f82d5c1432d44677237f43f5302fe73132bea..8c1f65f69d3e593edef84abbba190b811293422a 100644
--- a/ui/Base.lproj/RegisterNameWindow.strings
+++ b/ui/Base.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your ID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Other users can use it instead of your ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "An error occured during your username registration";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Enter your password";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Window";
diff --git a/ui/Base.lproj/RegisterNameWindow.xib b/ui/Base.lproj/RegisterNameWindow.xib
index 81c5874d2ad6e25c219c7b7626ccec7f8e1d0629..dec0ce08c84d48c57b130553a5c3b96bcba09482 100644
--- a/ui/Base.lproj/RegisterNameWindow.xib
+++ b/ui/Base.lproj/RegisterNameWindow.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -77,7 +77,7 @@ DQ
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oFy-jN-crC">
                                 <rect key="frame" x="33" y="103" width="359" height="17"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Other users can use it instead of your RingID" id="9gi-0u-67t">
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Other users can use it instead of your ID" id="9gi-0u-67t">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/RingWindow.strings b/ui/Base.lproj/RingWindow.strings
index 7ac52b23aa44effb0bf32a854298489865e5a7a4..adced88a14216c87bbaa1dedc411ace42ce4a09b 100644
--- a/ui/Base.lproj/RingWindow.strings
+++ b/ui/Base.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index d93beee5bf4100c27594b846563157d56ce12859..7ad4d2ddeeef6b6c302426128e08bc15ce2586d8 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -2,6 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -12,6 +13,7 @@
                 <outlet property="centerYWelcomeContainerConstraint" destination="Duk-XW-qcv" id="Jg8-0V-Khf"/>
                 <outlet property="chooseAccountVC" destination="TbU-3l-q8n" id="3VE-q3-kc6"/>
                 <outlet property="currentView" destination="se5-gp-TjO" id="Sae-7F-MB3"/>
+                <outlet property="explanationLabel" destination="kFj-Sh-o5u" id="br5-P4-3yq"/>
                 <outlet property="qrcodeView" destination="dZR-JL-MY4" id="6Jf-42-qwY"/>
                 <outlet property="ringIDLabel" destination="JN3-vO-zcd" id="WHd-L7-6od"/>
                 <outlet property="shareButton" destination="Oac-o7-2Ge" id="b0D-xr-PCx"/>
@@ -583,15 +585,14 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="D6e-KX-8gC">
-                                <rect key="frame" x="105" y="194" width="520" height="270"/>
+                                <rect key="frame" x="105" y="184" width="520" height="290"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kFj-Sh-o5u">
-                                        <rect key="frame" x="95" y="98" width="330" height="19"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="326" id="i1K-ok-BEb"/>
-                                        </constraints>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="This is your RingID. Copy and share it with your friends!" id="Xb9-UT-M2F">
+                                        <rect key="frame" x="153" y="96" width="214" height="38"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="Xb9-UT-M2F">
                                             <font key="font" size="13" name="HelveticaNeue"/>
+                                            <string key="title">This is your ID.
+Copy and share it with your friends!</string>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -599,33 +600,16 @@
                                             <binding destination="-2" name="hidden" keyPath="self.notRingAccount" id="r7A-Pi-WHz"/>
                                         </connections>
                                     </textField>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="phj-Jr-1k3" customClass="RingIDField">
-                                        <rect key="frame" x="20" y="64" width="400" height="26"/>
-                                        <subviews>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JN3-vO-zcd" userLabel="Ring ID">
-                                                <rect key="frame" x="-2" y="3" width="404" height="21"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="400" id="ywt-Ml-u9k"/>
-                                                </constraints>
-                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="center" id="qCF-Zf-vZg">
-                                                    <font key="font" size="15" name="HelveticaNeue"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="26" id="MfX-MV-DHO"/>
-                                            <constraint firstItem="JN3-vO-zcd" firstAttribute="centerX" secondItem="phj-Jr-1k3" secondAttribute="centerX" id="NjD-HV-YiQ"/>
-                                            <constraint firstAttribute="width" constant="400" id="OiR-zK-Cwd"/>
-                                            <constraint firstItem="JN3-vO-zcd" firstAttribute="centerY" secondItem="phj-Jr-1k3" secondAttribute="centerY" id="aWE-ds-8AU"/>
-                                        </constraints>
-                                        <connections>
-                                            <binding destination="-2" name="hidden" keyPath="self.isSIPAccount" id="wn4-Ot-QG5"/>
-                                        </connections>
-                                    </customView>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JN3-vO-zcd" userLabel="Ring ID">
+                                        <rect key="frame" x="256" y="65" width="8" height="23"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="center" id="qCF-Zf-vZg">
+                                            <font key="font" size="15" name="HelveticaNeue-Light"/>
+                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f62-JV-dgr">
-                                        <rect key="frame" x="147" y="175" width="225" height="75"/>
+                                        <rect key="frame" x="147" y="195" width="225" height="75"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="75" id="mWM-v0-n2w"/>
                                             <constraint firstAttribute="width" constant="225" id="paw-4z-Zbv"/>
@@ -633,32 +617,53 @@
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="symbol_name" id="9ti-Q4-TAv"/>
                                     </imageView>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge">
-                                        <rect key="frame" x="470" y="62" width="30" height="30"/>
+                                        <rect key="frame" x="262" y="25" width="25" height="25"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="30" id="AXu-uA-KCC"/>
-                                            <constraint firstAttribute="width" constant="30" id="h6a-Lg-QRm"/>
+                                            <constraint firstAttribute="width" constant="25" id="fnM-Dp-xQa"/>
+                                            <constraint firstAttribute="height" constant="25" id="jXA-ZW-tFp"/>
                                         </constraints>
-                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSShareTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Z08-dU-5EN">
+                                        <buttonCell key="cell" type="inline" bezelStyle="inline" image="NSShareTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Z08-dU-5EN">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
+                                            <font key="font" metaFont="smallSystemBold"/>
                                         </buttonCell>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+                                                <integer key="value" value="4"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+                                                <color key="value" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
+                                                <color key="value" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
                                         <connections>
                                             <action selector="shareRingID:" target="-2" id="8bY-RW-cQS"/>
                                             <binding destination="-2" name="hidden" keyPath="self.notRingAccount" id="CUd-nb-MzH"/>
                                         </connections>
                                     </button>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J" customClass="IconButton">
-                                        <rect key="frame" x="431" y="62" width="30" height="30"/>
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J">
+                                        <rect key="frame" x="227" y="25" width="25" height="25"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="30" id="FrZ-2C-m7y"/>
+                                            <constraint firstAttribute="width" constant="25" id="FrZ-2C-m7y"/>
+                                            <constraint firstAttribute="height" constant="25" id="tSo-l1-mnZ"/>
                                         </constraints>
-                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="qrcode" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="vvm-Gy-Tbh">
+                                        <buttonCell key="cell" type="inline" bezelStyle="inline" image="qrcode" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="vvm-Gy-Tbh">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
+                                            <font key="font" metaFont="smallSystemBold"/>
                                         </buttonCell>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
-                                                <integer key="value" value="6"/>
+                                                <integer key="value" value="4"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
+                                                <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
+                                                <color key="value" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+                                                <color key="value" name="textColor" catalog="System" colorSpace="catalog"/>
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                         <connections>
@@ -667,30 +672,29 @@
                                         </connections>
                                     </button>
                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VJ1-xk-v5e">
-                                        <rect key="frame" x="23" y="125" width="473" height="42"/>
-                                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Ring is free software for universal communication which respects the freedoms and privacy of its users." id="eln-Vm-t0d">
-                                            <font key="font" size="15" name="HelveticaNeue"/>
-                                            <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                        <rect key="frame" x="74" y="149" width="371" height="46"/>
+                                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Jami is free software for universal communication which respects the freedoms and privacy of its users." id="eln-Vm-t0d">
+                                            <font key="font" size="15" name="HelveticaNeue-Light"/>
+                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="f62-JV-dgr" firstAttribute="top" secondItem="D6e-KX-8gC" secondAttribute="top" constant="20" id="0b6-u8-yQg"/>
-                                    <constraint firstItem="Oac-o7-2Ge" firstAttribute="centerY" secondItem="phj-Jr-1k3" secondAttribute="centerY" id="7Mi-oH-cpB"/>
+                                    <constraint firstItem="eXV-BT-B6J" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" constant="-20" id="GCY-if-25J"/>
                                     <constraint firstItem="VJ1-xk-v5e" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="ID9-YU-lFv"/>
-                                    <constraint firstAttribute="trailing" secondItem="Oac-o7-2Ge" secondAttribute="trailing" constant="20" id="J2a-v7-JnP"/>
-                                    <constraint firstAttribute="height" constant="270" id="PLl-IK-oQA"/>
-                                    <constraint firstItem="Oac-o7-2Ge" firstAttribute="leading" secondItem="eXV-BT-B6J" secondAttribute="trailing" constant="9" id="TPn-gc-dPs"/>
+                                    <constraint firstAttribute="height" constant="290" id="PLl-IK-oQA"/>
+                                    <constraint firstItem="eXV-BT-B6J" firstAttribute="top" secondItem="JN3-vO-zcd" secondAttribute="bottom" constant="15" id="S1e-It-dha"/>
                                     <constraint firstItem="f62-JV-dgr" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="VTp-M2-i33"/>
+                                    <constraint firstItem="JN3-vO-zcd" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="8" id="WdR-8q-Lkl"/>
                                     <constraint firstItem="kFj-Sh-o5u" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="X8P-ae-ug3"/>
-                                    <constraint firstItem="phj-Jr-1k3" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="8" id="bWw-O7-rZE"/>
-                                    <constraint firstItem="eXV-BT-B6J" firstAttribute="centerY" secondItem="phj-Jr-1k3" secondAttribute="centerY" id="hRc-dW-Yyd"/>
-                                    <constraint firstItem="eXV-BT-B6J" firstAttribute="leading" secondItem="phj-Jr-1k3" secondAttribute="trailing" constant="11" id="iRA-Sd-F98"/>
-                                    <constraint firstItem="eXV-BT-B6J" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="6" id="jfB-b4-Gyc"/>
+                                    <constraint firstItem="Oac-o7-2Ge" firstAttribute="leading" secondItem="eXV-BT-B6J" secondAttribute="trailing" constant="10" id="eN6-s3-z6X"/>
+                                    <constraint firstItem="Oac-o7-2Ge" firstAttribute="centerY" secondItem="eXV-BT-B6J" secondAttribute="centerY" id="luh-LH-oXu"/>
                                     <constraint firstAttribute="width" constant="520" id="nXn-Wh-VAi"/>
-                                    <constraint firstItem="kFj-Sh-o5u" firstAttribute="top" secondItem="VJ1-xk-v5e" secondAttribute="bottom" constant="8" id="wQ0-UB-Yo2"/>
-                                    <constraint firstItem="VJ1-xk-v5e" firstAttribute="top" secondItem="f62-JV-dgr" secondAttribute="bottom" constant="8" id="zNb-f8-m6q"/>
+                                    <constraint firstItem="kFj-Sh-o5u" firstAttribute="top" secondItem="VJ1-xk-v5e" secondAttribute="bottom" constant="15" id="wQ0-UB-Yo2"/>
+                                    <constraint firstItem="JN3-vO-zcd" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="zBy-e3-F7X"/>
+                                    <constraint firstItem="VJ1-xk-v5e" firstAttribute="top" secondItem="f62-JV-dgr" secondAttribute="bottom" id="zNb-f8-m6q"/>
                                 </constraints>
                             </customView>
                             <customView focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="tSW-YT-asL">
@@ -709,7 +713,7 @@
                             <constraint firstAttribute="bottom" secondItem="tSW-YT-asL" secondAttribute="bottom" id="OW1-T7-eV8"/>
                             <constraint firstAttribute="trailing" secondItem="tSW-YT-asL" secondAttribute="trailing" id="Vm1-Ql-lxQ"/>
                             <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="dZR-JL-MY4" secondAttribute="bottom" constant="8" id="XdW-61-RbL"/>
-                            <constraint firstItem="D6e-KX-8gC" firstAttribute="top" relation="greaterThanOrEqual" secondItem="Fzg-MB-mlx" secondAttribute="top" constant="20" id="cwV-ZJ-bld"/>
+                            <constraint firstItem="D6e-KX-8gC" firstAttribute="top" relation="greaterThanOrEqual" secondItem="Fzg-MB-mlx" secondAttribute="top" constant="40" id="cwV-ZJ-bld"/>
                             <constraint firstItem="dZR-JL-MY4" firstAttribute="centerX" secondItem="Fzg-MB-mlx" secondAttribute="centerX" id="ejM-RR-NBl"/>
                             <constraint firstItem="D6e-KX-8gC" firstAttribute="centerX" secondItem="Fzg-MB-mlx" secondAttribute="centerX" id="fjr-1a-hEA"/>
                             <constraint firstItem="tSW-YT-asL" firstAttribute="top" secondItem="Fzg-MB-mlx" secondAttribute="top" id="kVw-UP-9a7"/>
@@ -774,7 +778,7 @@
         <image name="ic_action_cancel" width="72" height="72"/>
         <image name="ic_person_add" width="48" height="48"/>
         <image name="qrcode" width="72" height="72"/>
-        <image name="symbol_blue" width="161.6842041015625" height="161.6842041015625"/>
-        <image name="symbol_name" width="573" height="191"/>
+        <image name="symbol_blue" width="512" height="512"/>
+        <image name="symbol_name" width="400" height="144"/>
     </resources>
 </document>
diff --git a/ui/Base.lproj/RingWizard.strings b/ui/Base.lproj/RingWizard.strings
index 71fa79629d898756955860a97b4f0b72715fa7c8..316a5d7653b2a65e735102f46330728df743c2bf 100644
--- a/ui/Base.lproj/RingWizard.strings
+++ b/ui/Base.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "Welcome to Ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Welcome to Jami";
diff --git a/ui/Base.lproj/RingWizard.xib b/ui/Base.lproj/RingWizard.xib
index 652e4532eb5a3810a6e9ad309258592c354026a8..a4218078a328c037dfed22ba21d7c71a72ef0ab8 100644
--- a/ui/Base.lproj/RingWizard.xib
+++ b/ui/Base.lproj/RingWizard.xib
@@ -34,15 +34,15 @@
                         <rect key="frame" x="0.0" y="248" width="450" height="70"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EpY-Kl-fNa">
-                                <rect key="frame" x="88" y="17" width="221" height="36"/>
-                                <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Welcome to Ring" id="2mM-yx-BfM">
+                                <rect key="frame" x="86" y="17" width="225" height="36"/>
+                                <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Welcome to Jami" id="2mM-yx-BfM">
                                     <font key="font" metaFont="system" size="30"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="P7h-tj-klA">
-                                <rect key="frame" x="315" y="12" width="45" height="46"/>
+                                <rect key="frame" x="317" y="12" width="45" height="46"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="45" id="XMY-BN-Ymg"/>
                                     <constraint firstAttribute="height" constant="46" id="i8K-g8-EfQ"/>
@@ -87,6 +87,6 @@
         <viewController nibName="RingWizardNewAccount" id="M2H-0Y-6UW" customClass="RingWizardNewAccountVC"/>
     </objects>
     <resources>
-        <image name="symbol_blue" width="161.6842041015625" height="161.6842041015625"/>
+        <image name="symbol_blue" width="512" height="512"/>
     </resources>
 </document>
diff --git a/ui/Base.lproj/RingWizardChoose.strings b/ui/Base.lproj/RingWizardChoose.strings
index c3b4c3def889c4f61722769190d4e1a9e24c85b3..382a00717cca41cd4a5cfeb54aebefdf50c59fd4 100644
--- a/ui/Base.lproj/RingWizardChoose.strings
+++ b/ui/Base.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/Base.lproj/RingWizardChoose.xib b/ui/Base.lproj/RingWizardChoose.xib
index 43fc127cfe3aea868eb6194468ec1af9642bfab1..b087e24f11a02cd4896ff2944fb09dcba2515138 100644
--- a/ui/Base.lproj/RingWizardChoose.xib
+++ b/ui/Base.lproj/RingWizardChoose.xib
@@ -43,7 +43,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="kX1-30-jfa"/>
                     </constraints>
-                    <buttonCell key="cell" type="bevel" title="Create a Ring account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k1T-a7-yZD">
+                    <buttonCell key="cell" type="bevel" title="Create a Jami account" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="k1T-a7-yZD">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
diff --git a/ui/Base.lproj/RingWizardLinkAccount.strings b/ui/Base.lproj/RingWizardLinkAccount.strings
index 9b1ec83450a11c54dd0521f500918d0a962e3905..8bc68a4357c6c076b7e324aff9385f3f4e4b2b75 100644
--- a/ui/Base.lproj/RingWizardLinkAccount.strings
+++ b/ui/Base.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancel";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancel";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/Base.lproj/RingWizardLinkAccount.xib b/ui/Base.lproj/RingWizardLinkAccount.xib
index 4dd2486fbc95c355b81c855ce1f68a5ce96e9231..51cdcf52737d0253c1a5128924b8ba8b9210f963 100644
--- a/ui/Base.lproj/RingWizardLinkAccount.xib
+++ b/ui/Base.lproj/RingWizardLinkAccount.xib
@@ -152,8 +152,8 @@ DQ
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGs-mP-zJd">
-                    <rect key="frame" x="125" y="96" width="211" height="17"/>
-                    <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter your Ring account password" id="U2K-fu-INc">
+                    <rect key="frame" x="125" y="96" width="98" height="17"/>
+                    <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter password" id="U2K-fu-INc">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -318,7 +318,7 @@ DQ
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="justified" id="2uK-1s-tk7">
                         <font key="font" metaFont="smallSystem"/>
                         <string key="title">	You can import your account from the another device, but first, you need to obtain a PIN code. 
-	To generate the PIN code, go to the account management setting of a previous device, choose the Ring Account to use and select "Link another device to this account". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.</string>
+	To generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select "Link another device to this account". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.</string>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
diff --git a/ui/Base.lproj/RingWizardNewAccount.strings b/ui/Base.lproj/RingWizardNewAccount.strings
index cd27b20f85bd2940f3af3bf1ba9c871615feb775..85edd19e1d75b3a426c1e8f5e1712f79885e9d59 100644
--- a/ui/Base.lproj/RingWizardNewAccount.strings
+++ b/ui/Base.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/Base.lproj/RingWizardNewAccount.xib b/ui/Base.lproj/RingWizardNewAccount.xib
index 679632b369aa43a7b1dd3330d3663ae661a04311..1d2b2aaa500b0d6a2287722abba9c3ddeffc2708 100644
--- a/ui/Base.lproj/RingWizardNewAccount.xib
+++ b/ui/Base.lproj/RingWizardNewAccount.xib
@@ -487,7 +487,7 @@ Gw
                     </constraints>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="justified" id="0qE-Sz-hdc">
                         <font key="font" metaFont="smallSystem"/>
-                        <string key="title">By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.</string>
+                        <string key="title">By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your D which is 40 characters long.</string>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>