diff --git a/client/Mac/CertificateDialog.m b/client/Mac/CertificateDialog.m
index 450b90f65..dc01e10d1 100644
--- a/client/Mac/CertificateDialog.m
+++ b/client/Mac/CertificateDialog.m
@@ -35,6 +35,7 @@
 @synthesize textFingerprint;
 @synthesize textIssuer;
 @synthesize textSubject;
+@synthesize textMismatch;
 @synthesize messageLabel;
 @synthesize serverHostname;
 @synthesize commonName;
diff --git a/client/Mac/CertificateDialog.xib b/client/Mac/CertificateDialog.xib
index b9da883be..c154899f1 100644
--- a/client/Mac/CertificateDialog.xib
+++ b/client/Mac/CertificateDialog.xib
@@ -1,5 +1,5 @@
 <?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">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,25 +21,24 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" texturedBackground="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+            <rect key="contentRect" x="196" y="240" width="641" height="338"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+                <rect key="frame" x="0.0" y="0.0" width="641" height="338"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7">
-                        <rect key="frame" x="47" y="206" width="344" height="17"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="340" id="19"/>
-                        </constraints>
+                    <textField verticalHuggingPriority="750" id="7">
+                        <rect key="frame" x="47" y="274" width="344" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" sendsActionOnEndEditing="YES" title="Certificate for SERVER_NAME" placeholderString="" id="20">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8">
-                        <rect key="frame" x="384" y="13" width="82" height="32"/>
+                    <button verticalHuggingPriority="750" id="8">
+                        <rect key="frame" x="545" y="13" width="82" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="18">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -51,11 +50,9 @@ Gw
                             <action selector="onCancel:" target="-2" id="52"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                        <rect key="frame" x="302" y="13" width="82" height="32"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="70" id="16"/>
-                        </constraints>
+                    <button verticalHuggingPriority="750" id="9">
+                        <rect key="frame" x="463" y="13" width="82" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="17">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -64,123 +61,109 @@ DQ
 </string>
                         </buttonCell>
                         <connections>
+                            <accessibilityConnection property="link" destination="8" id="cks-Lf-tCO"/>
                             <action selector="onAccept:" target="-2" id="522"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7I5-a2-h65">
-                        <rect key="frame" x="197" y="13" width="105" height="32"/>
+                    <button verticalHuggingPriority="750" id="7I5-a2-h65">
+                        <rect key="frame" x="358" y="13" width="105" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Temporary" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="i6y-0u-COa">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
-                            <string key="keyEquivalent" base64-UTF8="YES">
-                            </string>
                         </buttonCell>
                         <connections>
+                            <accessibilityConnection property="link" destination="9" id="5nn-SX-Rqq"/>
                             <action selector="onTemporary:" target="-2" id="BWk-o1-tug"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LgQ-ni-jXv">
-                        <rect key="frame" x="47" y="168" width="429" height="36"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="102" id="ymW-Lu-B1W"/>
-                        </constraints>
-                        <textFieldCell key="cell" wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" sendsActionOnEndEditing="YES" title="ATTENTION: The common name does not match the server name!" id="94f-Om-tJh">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5">
-                        <rect key="frame" x="47" y="118" width="51" height="17"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" sendsActionOnEndEditing="YES" title="Subject" id="22">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vA4-qf-QuW">
-                        <rect key="frame" x="47" y="93" width="41" height="17"/>
+                    <textField verticalHuggingPriority="750" id="LgQ-ni-jXv">
+                        <rect key="frame" x="47" y="236" width="582" height="36"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" sendsActionOnEndEditing="YES" title="Issuer" id="tAl-Qh-OR9">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="ATTENTION: The common name does not match the server name!" id="94f-Om-tJh">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VLG-f9-Gcl">
-                        <rect key="frame" x="47" y="68" width="71" height="17"/>
+                    <textField verticalHuggingPriority="750" id="5">
+                        <rect key="frame" x="47" y="186" width="89" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" sendsActionOnEndEditing="YES" title="Fingerprint" id="49l-Xk-MUH">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Subject" id="22">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="10">
-                        <rect key="frame" x="47" y="143" width="106" height="17"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="102" id="14"/>
-                        </constraints>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" sendsActionOnEndEditing="YES" title="Common" id="15">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2HW-of-a4n">
-                        <rect key="frame" x="140" y="143" width="305" height="17"/>
+                    <textField verticalHuggingPriority="750" id="vA4-qf-QuW">
+                        <rect key="frame" x="47" y="161" width="89" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="COMMON NAME" id="N48-2i-W6H">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Issuer" id="tAl-Qh-OR9">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="R9r-82-XAH">
-                        <rect key="frame" x="140" y="118" width="305" height="17"/>
+                    <textField verticalHuggingPriority="750" id="10">
+                        <rect key="frame" x="47" y="211" width="89" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="SUBJECT" id="iGw-oh-i3p">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Common" id="15">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kHA-F4-dxw">
-                        <rect key="frame" x="140" y="93" width="305" height="17"/>
+                    <textField verticalHuggingPriority="750" id="2HW-of-a4n">
+                        <rect key="frame" x="140" y="211" width="305" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="ISSUER" id="daP-a0-hI1">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="COMMON NAME" id="N48-2i-W6H">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cLB-ZO-jvx">
-                        <rect key="frame" x="140" y="49" width="329" height="36"/>
+                    <textField verticalHuggingPriority="750" id="R9r-82-XAH">
+                        <rect key="frame" x="140" y="186" width="305" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell"  wraps="YES" alignment="center" lineBreakMode="clipping" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="FINGERPRINT" id="VqU-vO-noG">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="SUBJECT" id="iGw-oh-i3p">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="kHA-F4-dxw">
+                        <rect key="frame" x="140" y="161" width="305" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="ISSUER" id="daP-a0-hI1">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="cLB-ZO-jvx">
+                        <rect key="frame" x="140" y="117" width="483" height="36"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="FINGERPRINT" id="VqU-vO-noG">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="VLG-f9-Gcl">
+                        <rect key="frame" x="47" y="136" width="89" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Fingerprint" id="49l-Xk-MUH">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                 </subviews>
-                <constraints>
-                    <constraint firstItem="8" firstAttribute="leading" secondItem="9" secondAttribute="trailing" id="32"/>
-                    <constraint firstItem="10" firstAttribute="leading" secondItem="5" secondAttribute="leading" id="34"/>
-                    <constraint firstItem="10" firstAttribute="leading" secondItem="7" secondAttribute="leading" id="37"/>
-                    <constraint firstAttribute="bottom" secondItem="9" secondAttribute="bottom" constant="20" symbolic="YES" id="39"/>
-                    <constraint firstItem="5" firstAttribute="centerY" secondItem="2" secondAttribute="centerY" id="41"/>
-                    <constraint firstAttribute="bottom" secondItem="8" secondAttribute="bottom" constant="20" symbolic="YES" id="42"/>
-                    <constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" constant="20" symbolic="YES" id="43"/>
-                    <constraint firstItem="7" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="49" id="44"/>
-                    <constraint firstItem="7" firstAttribute="top" secondItem="2" secondAttribute="top" constant="47" id="45"/>
-                </constraints>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="4"/>
             </connections>
-            <point key="canvasLocation" x="148" y="68"/>
+            <point key="canvasLocation" x="228.5" y="102"/>
         </window>
     </objects>
 </document>
diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m
index 24e8c7924..b00c5a9b2 100644
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@@ -60,7 +60,6 @@ static BOOL mac_begin_paint(rdpContext* context);
 static BOOL mac_end_paint(rdpContext* context);
 static BOOL mac_desktop_resize(rdpContext* context);
 
-static void update_activity_cb(freerdp* instance);
 static void input_activity_cb(freerdp* instance);
 
 static DWORD WINAPI mac_client_thread(void* param);
@@ -109,35 +108,6 @@ static DWORD WINAPI mac_client_thread(void* param);
 	return 0;
 }
 
-static DWORD WINAPI mac_client_update_thread(void* param)
-{
-	int status;
-	wMessage message;
-	wMessageQueue* queue;
-	rdpContext* context = (rdpContext*) param;
-	status = 1;
-	queue = freerdp_get_message_queue(context->instance,
-	                                  FREERDP_UPDATE_MESSAGE_QUEUE);
-
-	while (MessageQueue_Wait(queue))
-	{
-		while (MessageQueue_Peek(queue, &message, TRUE))
-		{
-			status = freerdp_message_queue_process_message(context->instance,
-			         FREERDP_UPDATE_MESSAGE_QUEUE, &message);
-
-			if (!status)
-				break;
-		}
-
-		if (!status)
-			break;
-	}
-
-	ExitThread(0);
-	return 0;
-}
-
 static DWORD WINAPI mac_client_input_thread(LPVOID param)
 {
 	int status;
@@ -1348,31 +1318,6 @@ BOOL mac_desktop_resize(rdpContext* context)
 	return TRUE;
 }
 
-void update_activity_cb(freerdp* instance)
-{
-	int status;
-	wMessage message;
-	wMessageQueue* queue;
-	status = 1;
-	queue = freerdp_get_message_queue(instance, FREERDP_UPDATE_MESSAGE_QUEUE);
-
-	if (queue)
-	{
-		while (MessageQueue_Peek(queue, &message, TRUE))
-		{
-			status = freerdp_message_queue_process_message(instance,
-			         FREERDP_UPDATE_MESSAGE_QUEUE, &message);
-
-			if (!status)
-				break;
-		}
-	}
-	else
-	{
-		WLog_ERR(TAG,  "update_activity_cb: No queue!");
-	}
-}
-
 void input_activity_cb(freerdp* instance)
 {
 	int status;
diff --git a/client/Mac/mf_client.m b/client/Mac/mf_client.m
index 8ebd882df..7dc41a7ee 100644
--- a/client/Mac/mf_client.m
+++ b/client/Mac/mf_client.m
@@ -112,30 +112,6 @@ static void mfreerdp_client_free(freerdp* instance, rdpContext* context)
 	CloseHandle(mfc->stopEvent);
 }
 
-static void freerdp_client_mouse_event(rdpContext* cfc, DWORD flags, int x,
-                                       int y)
-{
-	UINT32 width, height;
-	rdpInput* input = cfc->instance->input;
-	rdpSettings* settings = cfc->instance->settings;
-	width = settings->DesktopWidth;
-	height = settings->DesktopHeight;
-
-	if (x < 0)
-		x = 0;
-
-	if (x >= width)
-		x = width - 1;
-
-	if (y < 0)
-		y = 0;
-
-	if (y >= height)
-		y = height - 1;
-
-	freerdp_input_send_mouse_event(input, flags, x, y);
-}
-
 void mf_scale_mouse_event(void* context, rdpInput* input, UINT16 flags,
                           UINT16 x, UINT16 y)
 {