diff --git a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
index 053d78aa52..10e32913fa 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
+++ b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
@@ -32,7 +32,6 @@
 		98BF92441BF01CBE0002126A /* KMAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 98BF92421BF01CBE0002126A /* KMAboutWindowController.m */; };
 		98BF92451BF01CBE0002126A /* KMAboutWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 98BF92431BF01CBE0002126A /* KMAboutWindowController.xib */; };
 		98BF92471BF01D890002126A /* image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 98BF92461BF01D890002126A /* image.jpg */; };
-		98BF92491BF0216F0002126A /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 98BF92481BF0216F0002126A /* logo.png */; };
 		98BF924F1BF02DC20002126A /* KMBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 98BF924E1BF02DC20002126A /* KMBarView.m */; };
 		98BF92521BF03D4D0002126A /* KMAboutBGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 98BF92511BF03D4D0002126A /* KMAboutBGView.m */; };
 		98BF92541BF040A50002126A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 98BF92531BF040A50002126A /* title.png */; };
@@ -76,6 +75,7 @@
 		E28914D92028A78C0048E71E /* OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = E28914D82028A78C0048E71E /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E29F22F4201A59B1005EA234 /* KMInputMethodBrowserClientEventHandlerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E29F22F3201A59B1005EA234 /* KMInputMethodBrowserClientEventHandlerTests.m */; };
 		E2D5529D20DD8E0200D77CFB /* LegacyTestClient.m in Sources */ = {isa = PBXBuildFile; fileRef = E2D5529C20DD8E0200D77CFB /* LegacyTestClient.m */; };
+		E2EE23972142E2AD00EAA98C /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = E2EE23962142E2AC00EAA98C /* logo.png */; };
 		E61216E78B7F03FE755687F1 /* libPods-KeymanTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E7FB3417C46A01721AD32D0 /* libPods-KeymanTests.a */; };
 /* End PBXBuildFile section */
 
@@ -168,7 +168,6 @@
 		98BF92421BF01CBE0002126A /* KMAboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMAboutWindowController.m; sourceTree = "<group>"; };
 		98BF92431BF01CBE0002126A /* KMAboutWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMAboutWindowController.xib; sourceTree = "<group>"; };
 		98BF92461BF01D890002126A /* image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = image.jpg; sourceTree = "<group>"; };
-		98BF92481BF0216F0002126A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		98BF924D1BF02DC20002126A /* KMBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMBarView.h; sourceTree = "<group>"; };
 		98BF924E1BF02DC20002126A /* KMBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMBarView.m; sourceTree = "<group>"; };
 		98BF92501BF03D4D0002126A /* KMAboutBGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMAboutBGView.h; sourceTree = "<group>"; };
@@ -205,7 +204,7 @@
 		E213601D2142D7BF00A043B7 /* keyman-88.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "keyman-88.png"; sourceTree = "<group>"; };
 		E21799031FC5B74D00F2D66A /* KMInputMethodEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMInputMethodEventHandler.h; sourceTree = "<group>"; };
 		E21799041FC5B7BC00F2D66A /* KMInputMethodEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMInputMethodEventHandler.m; sourceTree = "<group>"; };
-		E21E645720C04EA7000D6274 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = Keyman4MacIM/KMAboutWindow/logo.png; sourceTree = SOURCE_ROOT; };
+		E21E645720C04EA7000D6274 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = Keyman4MacIM/KMConfiguration/logo.png; sourceTree = SOURCE_ROOT; };
 		E22020F3200505EF00B74FAC /* KMInputMethodSafariClientEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMInputMethodSafariClientEventHandler.h; sourceTree = "<group>"; };
 		E22020F5200506F300B74FAC /* KMInputMethodSafariClientEventHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMInputMethodSafariClientEventHandler.m; sourceTree = "<group>"; };
 		E22020F920050D6300B74FAC /* KMInputMethodBrowserClientEventHandlerProtected.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMInputMethodBrowserClientEventHandlerProtected.h; sourceTree = "<group>"; };
@@ -229,6 +228,7 @@
 		E2C92D4720B46CEA00742A7D /* KeymanEngine4Mac.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = KeymanEngine4Mac.framework.dSYM; path = Keyman4MacIM/Frameworks/KeymanEngine4Mac.framework.dSYM; sourceTree = "<group>"; };
 		E2D5529B20DD8D6100D77CFB /* LegacyTestClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LegacyTestClient.h; sourceTree = "<group>"; };
 		E2D5529C20DD8E0200D77CFB /* LegacyTestClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LegacyTestClient.m; sourceTree = "<group>"; };
+		E2EE23962142E2AC00EAA98C /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = Keyman4MacIM/KMConfiguration/logo.png; sourceTree = "<group>"; };
 		FA67C64E3D2743D2BCF46ED1 /* Pods-KeymanTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KeymanTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-KeymanTests/Pods-KeymanTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -275,6 +275,7 @@
 		983246EC1A9E8E860010B90C /* KMConfiguration */ = {
 			isa = PBXGroup;
 			children = (
+				E2EE23962142E2AC00EAA98C /* logo.png */,
 				9832472C1A9EABC70010B90C /* KMConfigColumn1CellView.h */,
 				9832472D1A9EABC70010B90C /* KMConfigColumn1CellView.m */,
 				983247B01A9EB9690010B90C /* KMConfigColumn3CellView.h */,
@@ -430,7 +431,6 @@
 				E213601D2142D7BF00A043B7 /* keyman-88.png */,
 				E23380FA21407AA100B90591 /* SILInBlue76.png */,
 				98BF92461BF01D890002126A /* image.jpg */,
-				98BF92481BF0216F0002126A /* logo.png */,
 				98BF92531BF040A50002126A /* title.png */,
 			);
 			path = KMAboutWindow;
@@ -610,7 +610,6 @@
 				9874C3221B536847000BB543 /* keyman.png in Resources */,
 				989C9C131A7876DE00A20425 /* Images.xcassets in Resources */,
 				98E2CEA11A92C39C00AE2455 /* InfoPlist.strings in Resources */,
-				98BF92491BF0216F0002126A /* logo.png in Resources */,
 				E21E645820C04EA8000D6274 /* logo.png in Resources */,
 				E23380FB21407AA100B90591 /* SILInBlue76.png in Resources */,
 				9874C3211B536847000BB543 /* info.png in Resources */,
@@ -619,6 +618,7 @@
 				98FE10641B4DEE5600525F54 /* KMInfoWindowController.xib in Resources */,
 				E213601E2142D7C000A043B7 /* keyman-88.png in Resources */,
 				98BF92471BF01D890002126A /* image.jpg in Resources */,
+				E2EE23972142E2AD00EAA98C /* logo.png in Resources */,
 				98BF92451BF01CBE0002126A /* KMAboutWindowController.xib in Resources */,
 				98F3C8941A8D739500F675E3 /* preferences.xib in Resources */,
 				9800EC5A1C02940300BF0FB5 /* keyman-for-mac-os-license.html in Resources */,
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.m
index 1a6fd7f11e..14491e3908 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.m
@@ -28,14 +28,14 @@
     [self.window setBackgroundColor:[NSColor whiteColor]];
     NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
     NSString *build = [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey];
-    [self.versionLabel setStringValue:[NSString stringWithFormat:@"Version %@ (build %@)", version, build]];
-    
-    NSMutableString *copyrightInfo = [[NSMutableString alloc] initWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"NSHumanReadableCopyright"]];
-    NSRange copyrightSymbolLocation = [copyrightInfo rangeOfString:@"©"];
-    if (copyrightSymbolLocation.location > 0 && copyrightSymbolLocation.length == 1)
-    {
-        [copyrightInfo insertString:@"\n" atIndex:copyrightSymbolLocation.location];
+    if ([version isEqualToString:build]) {
+        [self.versionLabel setStringValue:[NSString stringWithFormat:@"Version %@", version]];
     }
+    else {
+        [self.versionLabel setStringValue:[NSString stringWithFormat:@"Version %@ (build %@)", version, build]];
+    }
+         
+    NSMutableString *copyrightInfo = [[NSMutableString alloc] initWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"NSHumanReadableCopyright"]];
     [self.copyrightLabel setStringValue:copyrightInfo];
 
     NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:[self.licenseButton bounds]
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib
index 95c2f5d7e0..bfc57e988e 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/KMAboutWindowController.xib
@@ -19,44 +19,31 @@
         <window title="KeymanMac" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="KMAboutWindow">
             <windowStyleMask key="styleMask" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="450" height="300"/>
+            <rect key="contentRect" x="196" y="240" width="450" height="318"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <view key="contentView" id="se5-gp-TjO" customClass="KMAboutBGView">
-                <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
+                <rect key="frame" x="0.0" y="0.0" width="450" height="318"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FYn-ZH-f76">
-                        <rect key="frame" x="0.0" y="76" width="450" height="150"/>
+                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FYn-ZH-f76">
+                        <rect key="frame" x="0.0" y="95" width="450" height="150"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="450" id="hah-EB-4r4"/>
                             <constraint firstAttribute="height" constant="150" id="oF1-V1-6Sf"/>
                         </constraints>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="image" id="LQf-V6-Tof"/>
                     </imageView>
-                    <customView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wFc-QI-nGq" customClass="KMBarView">
-                        <rect key="frame" x="0.0" y="226" width="450" height="7"/>
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="wFc-QI-nGq" customClass="KMBarView">
+                        <rect key="frame" x="0.0" y="245" width="450" height="7"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="7" id="NHA-id-0ze"/>
                             <constraint firstAttribute="width" constant="450" id="vat-1d-q8p"/>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="7" id="vyH-ga-e1G"/>
                         </constraints>
                     </customView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ln9-LY-e8d">
-                        <rect key="frame" x="10" y="20" width="200" height="15"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i8D-2n-KYh">
+                        <rect key="frame" x="20" y="60" width="89" height="19"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="15" id="Eps-Mv-cM9"/>
-                            <constraint firstAttribute="width" constant="196" id="OEW-Si-NHr"/>
-                        </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Version 1.0.100" id="69w-EI-e3y">
-                            <font key="font" metaFont="miniSystem"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i8D-2n-KYh">
-                        <rect key="frame" x="10" y="41" width="90" height="19"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="90" id="EbG-vA-8du"/>
                             <constraint firstAttribute="height" constant="19" id="si0-WI-zp7"/>
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="License Agreement" bezelStyle="roundedRect" alignment="left" controlSize="mini" state="on" imageScaling="proportionallyDown" inset="2" id="hYC-Bx-aoP">
@@ -67,30 +54,31 @@
                             <action selector="licenseAction:" target="-2" id="DOO-Wo-6Sv"/>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IcZ-9F-kwH">
-                        <rect key="frame" x="10" y="10" width="190" height="11"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ln9-LY-e8d">
+                        <rect key="frame" x="20" y="35" width="256" height="15"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="15" id="Eps-Mv-cM9"/>
+                        </constraints>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Version 1.0.100" id="69w-EI-e3y">
+                            <font key="font" metaFont="miniSystem"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IcZ-9F-kwH">
+                        <rect key="frame" x="20" y="20" width="80" height="11"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright ©2018" id="fjZ-Vg-DtW">
                             <font key="font" metaFont="miniSystem"/>
                             <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" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sgd-KC-LbG">
-                        <rect key="frame" x="394" y="243" width="42" height="45"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sgd-KC-LbG">
+                        <rect key="frame" x="403" y="263" width="32" height="36"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="SILInBlue76" id="0zb-i2-bhN"/>
                     </imageView>
-                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UOr-Co-IuK">
-                        <rect key="frame" x="12" y="234" width="186" height="63"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="48" id="13X-xl-BgG"/>
-                            <constraint firstAttribute="width" constant="48" id="nsA-cc-d9t"/>
-                        </constraints>
-                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyUpOrDown" image="keyman-88" id="4mp-20-rlf"/>
-                    </imageView>
-                    <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XIT-T3-xre">
-                        <rect key="frame" x="386" y="9" width="50" height="19"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XIT-T3-xre">
+                        <rect key="frame" x="390" y="19" width="50" height="19"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="CPF-NR-u5o"/>
                             <constraint firstAttribute="width" constant="50" id="DAH-lD-hjp"/>
@@ -103,8 +91,8 @@
                             <action selector="closeAction:" target="-2" id="frJ-pm-Iyg"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xqc-bi-pPI">
-                        <rect key="frame" x="278" y="9" width="100" height="19"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xqc-bi-pPI">
+                        <rect key="frame" x="282" y="19" width="100" height="19"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="W0C-Lh-ns5"/>
                             <constraint firstAttribute="width" constant="100" id="l3A-K7-gqm"/>
@@ -117,30 +105,46 @@
                             <action selector="configAction:" target="-2" id="3W6-cm-6P5"/>
                         </connections>
                     </button>
+                    <imageView autoresizesSubviews="NO" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="UOr-Co-IuK">
+                        <rect key="frame" x="15" y="252" width="400" height="58"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="58" id="AMG-Zr-ebx"/>
+                        </constraints>
+                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyUpOrDown" image="keyman-88" id="4mp-20-rlf"/>
+                    </imageView>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="IcZ-9F-kwH" firstAttribute="top" secondItem="ln9-LY-e8d" secondAttribute="bottom" priority="750" constant="4" id="34l-hR-vnD"/>
                     <constraint firstAttribute="trailing" secondItem="wFc-QI-nGq" secondAttribute="trailing" id="3IX-BW-75e"/>
                     <constraint firstItem="FYn-ZH-f76" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="4Pt-4T-0oy"/>
                     <constraint firstAttribute="bottom" secondItem="XIT-T3-xre" secondAttribute="bottom" constant="20" id="4Yp-Kh-DkL"/>
                     <constraint firstItem="wFc-QI-nGq" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="5wh-lg-tMG"/>
-                    <constraint firstItem="i8D-2n-KYh" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="75V-Z3-L22"/>
+                    <constraint firstItem="sgd-KC-LbG" firstAttribute="centerY" secondItem="UOr-Co-IuK" secondAttribute="centerY" id="6m8-lC-irl"/>
+                    <constraint firstAttribute="bottom" secondItem="IcZ-9F-kwH" secondAttribute="bottom" constant="20" symbolic="YES" id="7Ws-Q0-kt9"/>
+                    <constraint firstItem="xqc-bi-pPI" firstAttribute="leading" secondItem="IcZ-9F-kwH" secondAttribute="trailing" priority="250" constant="8" symbolic="YES" id="8hY-Hr-7J0"/>
                     <constraint firstAttribute="trailing" secondItem="FYn-ZH-f76" secondAttribute="trailing" id="A7I-Rh-hkf"/>
-                    <constraint firstAttribute="bottom" secondItem="FYn-ZH-f76" secondAttribute="bottom" constant="73" id="L7A-L6-Rcz"/>
-                    <constraint firstItem="wFc-QI-nGq" firstAttribute="top" secondItem="UOr-Co-IuK" secondAttribute="bottom" constant="10" id="LBM-uP-nY9"/>
-                    <constraint firstItem="wFc-QI-nGq" firstAttribute="top" secondItem="ln9-LY-e8d" secondAttribute="bottom" constant="2" id="Nce-eH-8Y1"/>
-                    <constraint firstItem="UOr-Co-IuK" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="15" id="TsV-7T-FPF"/>
-                    <constraint firstAttribute="trailing" secondItem="ln9-LY-e8d" secondAttribute="trailing" constant="5" id="WLO-qQ-Rqn"/>
-                    <constraint firstAttribute="bottom" secondItem="i8D-2n-KYh" secondAttribute="bottom" id="ZTK-qO-ku8"/>
-                    <constraint firstItem="xqc-bi-pPI" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="10" id="klp-ej-xB8"/>
+                    <constraint firstAttribute="bottom" secondItem="FYn-ZH-f76" secondAttribute="bottom" priority="750" constant="93" id="L7A-L6-Rcz"/>
+                    <constraint firstItem="i8D-2n-KYh" firstAttribute="top" secondItem="FYn-ZH-f76" secondAttribute="bottom" constant="16" id="M00-mR-yMk"/>
+                    <constraint firstItem="UOr-Co-IuK" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="8" id="Ovf-6T-VEs"/>
+                    <constraint firstItem="UOr-Co-IuK" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="15" id="Wq2-xT-mCh"/>
+                    <constraint firstItem="XIT-T3-xre" firstAttribute="leading" secondItem="xqc-bi-pPI" secondAttribute="trailing" constant="8" symbolic="YES" id="Xu7-qs-jYd"/>
+                    <constraint firstItem="ln9-LY-e8d" firstAttribute="leading" secondItem="i8D-2n-KYh" secondAttribute="leading" constant="2" id="YgZ-NC-0Za"/>
+                    <constraint firstItem="wFc-QI-nGq" firstAttribute="top" secondItem="UOr-Co-IuK" secondAttribute="bottom" id="ZZw-D6-rjh"/>
+                    <constraint firstItem="XIT-T3-xre" firstAttribute="bottom" secondItem="xqc-bi-pPI" secondAttribute="bottom" id="cSa-p4-Xov"/>
+                    <constraint firstItem="xqc-bi-pPI" firstAttribute="leading" secondItem="ln9-LY-e8d" secondAttribute="trailing" priority="750" constant="8" symbolic="YES" id="ey1-4k-Pht"/>
+                    <constraint firstItem="i8D-2n-KYh" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="20" symbolic="YES" id="hLb-9t-eDw"/>
                     <constraint firstItem="FYn-ZH-f76" firstAttribute="top" secondItem="wFc-QI-nGq" secondAttribute="bottom" id="kuI-RR-4wa"/>
-                    <constraint firstItem="UOr-Co-IuK" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="12" id="l9c-4G-GZr"/>
                     <constraint firstAttribute="trailing" secondItem="XIT-T3-xre" secondAttribute="trailing" constant="10" id="pJs-ap-Bgn"/>
+                    <constraint firstItem="IcZ-9F-kwH" firstAttribute="leading" secondItem="ln9-LY-e8d" secondAttribute="leading" id="q3g-Rz-0gh"/>
+                    <constraint firstAttribute="trailing" secondItem="sgd-KC-LbG" secondAttribute="trailing" constant="15" id="xGg-Cj-G34"/>
                     <constraint firstAttribute="bottom" secondItem="xqc-bi-pPI" secondAttribute="bottom" constant="20" id="ysa-9B-9Vg"/>
+                    <constraint firstItem="ln9-LY-e8d" firstAttribute="top" secondItem="i8D-2n-KYh" secondAttribute="bottom" constant="10" id="znF-Zd-vGG"/>
                 </constraints>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
             </connections>
+            <point key="canvasLocation" x="132" y="133"/>
         </window>
     </objects>
     <resources>
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/logo.png b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/logo.png
similarity index 100%
rename from mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/logo.png
rename to mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/logo.png