diff --git a/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate b/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate
index 6c31ce8..0df4557 100644
Binary files a/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate and b/ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcuserdata/gerrit.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib b/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib
index b8e0683..29623db 100644
--- a/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib
+++ b/ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib
@@ -649,6 +649,7 @@
         </menu>
         <customObject id="494" customClass="ipbcAppDelegate">
             <connections>
+                <outlet property="settings" destination="S8t-Zf-oY7" id="fzj-sS-eON"/>
                 <outlet property="statusMenu" destination="6bZ-TK-7Qi" id="6e4-5n-iPl"/>
             </connections>
         </customObject>
@@ -657,6 +658,9 @@
             <items>
                 <menuItem title="Settings" id="5Qh-tN-CVg">
                     <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="fromMenuSettings:" target="494" id="0kd-9Z-Czn"/>
+                    </connections>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="tZs-DM-pOg"/>
                 <menuItem title="Quit" id="Vnb-AQ-Egh">
@@ -667,5 +671,15 @@
                 </menuItem>
             </items>
         </menu>
+        <window title="Settings" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="S8t-Zf-oY7">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="90" y="125" width="480" height="309"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <view key="contentView" id="R0G-2c-z7t">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="309"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+        </window>
     </objects>
 </document>
\ No newline at end of file
diff --git a/ipbc-Client/ipbc-Client/ipbcAppDelegate.h b/ipbc-Client/ipbc-Client/ipbcAppDelegate.h
index 6c9b947..eddb386 100644
--- a/ipbc-Client/ipbc-Client/ipbcAppDelegate.h
+++ b/ipbc-Client/ipbc-Client/ipbcAppDelegate.h
@@ -10,12 +10,14 @@
 
 @interface ipbcAppDelegate : NSObject <NSApplicationDelegate> {
     NSWindow *window;
+    IBOutlet NSWindow *settings;
     IBOutlet NSMenu *statusMenu;
     NSStatusItem * statusItem;
 }
 
 @property (assign) IBOutlet NSWindow *window;
 
+-(IBAction)fromMenuSettings:(id)sender;
 -(IBAction)fromMenuQuit:(id)sender;
 
 @end
diff --git a/ipbc-Client/ipbc-Client/ipbcAppDelegate.m b/ipbc-Client/ipbc-Client/ipbcAppDelegate.m
index 67a42e3..5f0ccd6 100644
--- a/ipbc-Client/ipbc-Client/ipbcAppDelegate.m
+++ b/ipbc-Client/ipbc-Client/ipbcAppDelegate.m
@@ -22,6 +22,10 @@
     [statusItem setHighlightMode:YES];
 }
 
+-(IBAction)fromMenuSettings:(id)sender {
+    [settings makeKeyAndOrderFront:nil];
+}
+
 -(IBAction)fromMenuQuit:(id)sender {
     [NSApp terminate:self];
 }