diff --git a/MacPass/IconSelection.xib b/MacPass/IconSelection.xib
index 48334397..c663fbbf 100644
--- a/MacPass/IconSelection.xib
+++ b/MacPass/IconSelection.xib
@@ -30,7 +30,7 @@
 		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">NSObject</string>
+				<string key="NSClassName">MPIconSelectViewController</string>
 			</object>
 			<object class="NSCustomObject" id="1003">
 				<string key="NSClassName">FirstResponder</string>
@@ -42,21 +42,21 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSScrollView" id="249678969">
+					<object class="NSScrollView" id="170990502">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSClipView" id="130513999">
-								<reference key="NSNextResponder" ref="249678969"/>
+							<object class="NSClipView" id="785205210">
+								<reference key="NSNextResponder" ref="170990502"/>
 								<int key="NSvFlags">2304</int>
 								<array class="NSMutableArray" key="NSSubviews">
-									<object class="NSCollectionView" id="916038714">
-										<reference key="NSNextResponder" ref="130513999"/>
+									<object class="NSCollectionView" id="697027275">
+										<reference key="NSNextResponder" ref="785205210"/>
 										<int key="NSvFlags">274</int>
-										<string key="NSFrameSize">{277, 219}</string>
-										<reference key="NSSuperview" ref="130513999"/>
+										<string key="NSFrameSize">{220, 258}</string>
+										<reference key="NSSuperview" ref="785205210"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="572989465"/>
+										<reference key="NSNextKeyView" ref="319187659"/>
 										<string key="NSReuseIdentifierKey">_NS:80</string>
 										<string key="NSMinGridSize">{0, 0}</string>
 										<string key="NSMaxGridSize">{0, 0}</string>
@@ -77,12 +77,12 @@
 										<int key="NSDraggingSourceMaskForNonLocal">0</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{1, 1}, {277, 219}}</string>
-								<reference key="NSSuperview" ref="249678969"/>
+								<string key="NSFrame">{{1, 1}, {220, 258}}</string>
+								<reference key="NSSuperview" ref="170990502"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="916038714"/>
+								<reference key="NSNextKeyView" ref="697027275"/>
 								<string key="NSReuseIdentifierKey">_NS:78</string>
-								<reference key="NSDocView" ref="916038714"/>
+								<reference key="NSDocView" ref="697027275"/>
 								<object class="NSColor" key="NSBGColor">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
@@ -91,127 +91,117 @@
 								</object>
 								<int key="NScvFlags">4</int>
 							</object>
-							<object class="NSScroller" id="572989465">
-								<reference key="NSNextResponder" ref="249678969"/>
+							<object class="NSScroller" id="319187659">
+								<reference key="NSNextResponder" ref="170990502"/>
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{234, 1}, {15, 143}}</string>
-								<reference key="NSSuperview" ref="249678969"/>
+								<reference key="NSSuperview" ref="170990502"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="219569615"/>
+								<reference key="NSNextKeyView" ref="775158265"/>
 								<string key="NSReuseIdentifierKey">_NS:82</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<reference key="NSTarget" ref="249678969"/>
+								<reference key="NSTarget" ref="170990502"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSCurValue">1</double>
 								<double key="NSPercent">0.89655172824859619</double>
 							</object>
-							<object class="NSScroller" id="219569615">
-								<reference key="NSNextResponder" ref="249678969"/>
+							<object class="NSScroller" id="775158265">
+								<reference key="NSNextResponder" ref="170990502"/>
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 144}, {233, 15}}</string>
-								<reference key="NSSuperview" ref="249678969"/>
+								<reference key="NSSuperview" ref="170990502"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:91</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
-								<reference key="NSTarget" ref="249678969"/>
+								<reference key="NSTarget" ref="170990502"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.63157892227172852</double>
 							</object>
 						</array>
-						<string key="NSFrame">{{20, 20}, {279, 221}}</string>
+						<string key="NSFrame">{{8, 6}, {222, 260}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="130513999"/>
+						<reference key="NSNextKeyView" ref="785205210"/>
 						<string key="NSReuseIdentifierKey">_NS:76</string>
 						<int key="NSsFlags">133682</int>
-						<reference key="NSVScroller" ref="572989465"/>
-						<reference key="NSHScroller" ref="219569615"/>
-						<reference key="NSContentView" ref="130513999"/>
+						<reference key="NSVScroller" ref="319187659"/>
+						<reference key="NSHScroller" ref="775158265"/>
+						<reference key="NSContentView" ref="785205210"/>
 						<double key="NSMinMagnification">0.25</double>
 						<double key="NSMaxMagnification">4</double>
 						<double key="NSMagnification">1</double>
 					</object>
 				</array>
-				<string key="NSFrameSize">{319, 261}</string>
+				<string key="NSFrameSize">{237, 274}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="249678969"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCollectionViewItem" id="417473882"/>
-			<object class="NSCustomView" id="897182677">
+			<object class="NSImageView" id="704432434">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSImageView" id="703863720">
-						<reference key="NSNextResponder" ref="897182677"/>
-						<int key="NSvFlags">268</int>
-						<set class="NSMutableSet" key="NSDragTypes">
-							<string>Apple PDF pasteboard type</string>
-							<string>Apple PICT pasteboard type</string>
-							<string>Apple PNG pasteboard type</string>
-							<string>NSFilenamesPboardType</string>
-							<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-							<string>NeXT TIFF v4.0 pasteboard type</string>
-						</set>
-						<string key="NSFrame">{{2, 2}, {40, 40}}</string>
-						<reference key="NSSuperview" ref="897182677"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSImageCell" key="NSCell" id="322925132">
-							<int key="NSCellFlags">134217728</int>
-							<int key="NSCellFlags2">33554432</int>
-							<object class="NSCustomResource" key="NSContents">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSActionTemplate</string>
-							</object>
-							<string key="NSCellIdentifier">_NS:9</string>
-							<int key="NSAlign">0</int>
-							<int key="NSScale">3</int>
-							<int key="NSStyle">2</int>
-							<bool key="NSAnimates">NO</bool>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						<bool key="NSEditable">YES</bool>
-					</object>
-				</array>
-				<string key="NSFrameSize">{44, 44}</string>
+				<set class="NSMutableSet" key="NSDragTypes">
+					<string>Apple PDF pasteboard type</string>
+					<string>Apple PICT pasteboard type</string>
+					<string>Apple PNG pasteboard type</string>
+					<string>NSFilenamesPboardType</string>
+					<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+					<string>NeXT TIFF v4.0 pasteboard type</string>
+				</set>
+				<string key="NSFrameSize">{48, 48}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="703863720"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<string key="NSClassName">NSView</string>
+				<bool key="NSEnabled">YES</bool>
+				<object class="NSImageCell" key="NSCell" id="655614209">
+					<int key="NSCellFlags">134217728</int>
+					<int key="NSCellFlags2">33554432</int>
+					<string key="NSCellIdentifier">_NS:9</string>
+					<int key="NSAlign">0</int>
+					<int key="NSScale">0</int>
+					<int key="NSStyle">2</int>
+					<bool key="NSAnimates">NO</bool>
+				</object>
+				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+				<bool key="NSEditable">YES</bool>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">56</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">itemPrototype</string>
-						<reference key="source" ref="916038714"/>
+						<reference key="source" ref="697027275"/>
 						<reference key="destination" ref="417473882"/>
 					</object>
-					<int key="connectionID">8</int>
+					<int key="connectionID">63</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view</string>
 						<reference key="source" ref="417473882"/>
-						<reference key="destination" ref="897182677"/>
+						<reference key="destination" ref="704432434"/>
 					</object>
-					<int key="connectionID">50</int>
+					<int key="connectionID">73</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">imageView</string>
 						<reference key="source" ref="417473882"/>
-						<reference key="destination" ref="703863720"/>
+						<reference key="destination" ref="704432434"/>
 					</object>
-					<int key="connectionID">51</int>
+					<int key="connectionID">74</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -244,228 +234,136 @@
 						<int key="objectID">1</int>
 						<reference key="object" ref="1005"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="249678969"/>
-							<object class="IBNSLayoutConstraint" id="370320586">
-								<reference key="firstItem" ref="1005"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="249678969"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="10587862">
+							<reference ref="170990502"/>
+							<object class="IBNSLayoutConstraint" id="173738250">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="249678969"/>
+								<reference key="secondItem" ref="170990502"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">7</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="947953854">
-								<reference key="firstItem" ref="249678969"/>
-								<int key="firstAttribute">5</int>
+							<object class="IBNSLayoutConstraint" id="645007486">
+								<reference key="firstItem" ref="1005"/>
+								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="1005"/>
-								<int key="secondAttribute">5</int>
+								<reference key="secondItem" ref="170990502"/>
+								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">6</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="770748264">
-								<reference key="firstItem" ref="249678969"/>
+							<object class="IBNSLayoutConstraint" id="39527220">
+								<reference key="firstItem" ref="170990502"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="1005"/>
 								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">8</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="540863170">
+								<reference key="firstItem" ref="170990502"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="249678969"/>
+						<int key="objectID">57</int>
+						<reference key="object" ref="170990502"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="916038714"/>
-							<reference ref="219569615"/>
-							<reference ref="572989465"/>
+							<reference ref="697027275"/>
+							<reference ref="775158265"/>
+							<reference ref="319187659"/>
 						</array>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="916038714"/>
-						<reference key="parent" ref="249678969"/>
+						<int key="objectID">58</int>
+						<reference key="object" ref="697027275"/>
+						<reference key="parent" ref="170990502"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="219569615"/>
-						<reference key="parent" ref="249678969"/>
+						<int key="objectID">59</int>
+						<reference key="object" ref="775158265"/>
+						<reference key="parent" ref="170990502"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="572989465"/>
-						<reference key="parent" ref="249678969"/>
+						<int key="objectID">60</int>
+						<reference key="object" ref="319187659"/>
+						<reference key="parent" ref="170990502"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
+						<int key="objectID">61</int>
 						<reference key="object" ref="417473882"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="770748264"/>
+						<int key="objectID">65</int>
+						<reference key="object" ref="540863170"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="947953854"/>
+						<int key="objectID">68</int>
+						<reference key="object" ref="39527220"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="10587862"/>
+						<int key="objectID">69</int>
+						<reference key="object" ref="645007486"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="370320586"/>
+						<int key="objectID">70</int>
+						<reference key="object" ref="173738250"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="897182677"/>
+						<int key="objectID">71</int>
+						<reference key="object" ref="704432434"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="679375270">
-								<reference key="firstItem" ref="703863720"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="897182677"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="897182677"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1044411121">
-								<reference key="firstItem" ref="703863720"/>
-								<int key="firstAttribute">9</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="897182677"/>
-								<int key="secondAttribute">9</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="897182677"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<reference ref="703863720"/>
+							<reference ref="655614209"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="703863720"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="322925132"/>
-							<object class="IBNSLayoutConstraint" id="809984383">
-								<reference key="firstItem" ref="703863720"/>
-								<int key="firstAttribute">8</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">34</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="703863720"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1012758680">
-								<reference key="firstItem" ref="703863720"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">34</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="703863720"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="897182677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="322925132"/>
-						<reference key="parent" ref="703863720"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">30</int>
-						<reference key="object" ref="1012758680"/>
-						<reference key="parent" ref="703863720"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="809984383"/>
-						<reference key="parent" ref="703863720"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="1044411121"/>
-						<reference key="parent" ref="897182677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">49</int>
-						<reference key="object" ref="679375270"/>
-						<reference key="parent" ref="897182677"/>
+						<int key="objectID">72</int>
+						<reference key="object" ref="655614209"/>
+						<reference key="parent" ref="704432434"/>
 					</object>
 				</array>
 			</object>
@@ -474,47 +372,49 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
-					<reference ref="770748264"/>
-					<reference ref="947953854"/>
-					<reference ref="10587862"/>
-					<reference ref="370320586"/>
+					<reference ref="540863170"/>
+					<reference ref="39527220"/>
+					<reference ref="645007486"/>
+					<reference ref="173738250"/>
 				</array>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="16.IBNSViewMetadataConstraints">
-					<reference ref="1044411121"/>
-					<reference ref="679375270"/>
-				</array>
-				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="17.IBNSViewMetadataConstraints">
-					<reference ref="1012758680"/>
-					<reference ref="809984383"/>
-				</array>
-				<boolean value="NO" key="17.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="57.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="65.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">51</int>
+			<int key="maxID">74</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">MPIconSelectViewController</string>
+					<string key="superclassName">MPViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPIconSelectViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPViewController</string>
+					<string key="superclassName">NSViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSLayoutConstraint</string>
 					<string key="superclassName">NSObject</string>
@@ -529,10 +429,6 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">NSActionTemplate</string>
-			<string key="NS.object.0">{15, 15}</string>
-		</object>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/MacPass/InspectorTabView.xib b/MacPass/InspectorTabView.xib
index b416c820..85ed6515 100644
--- a/MacPass/InspectorTabView.xib
+++ b/MacPass/InspectorTabView.xib
@@ -61,7 +61,7 @@
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSegmentedCell" key="NSCell" id="572388392">
 							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">0</int>
+							<int key="NSCellFlags2">32768</int>
 							<object class="NSFont" key="NSSupport">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">12</double>
@@ -147,7 +147,7 @@
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="81329947">
 							<int key="NSCellFlags">134217728</int>
-							<int key="NSCellFlags2">33554432</int>
+							<int key="NSCellFlags2">0</int>
 							<object class="NSCustomResource" key="NSContents">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSApplicationIcon</string>
@@ -167,7 +167,6 @@
 						<string key="NSFrame">{{0, -2}, {280, 482}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="936537698"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="745022448">
@@ -399,7 +398,6 @@
 											<string key="NSFrame">{{86, 285}, {135, 22}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSecureTextFieldCell" key="NSCell" id="552426058">
@@ -1929,7 +1927,7 @@
 					<string key="className">MPInspectorTabViewController</string>
 					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="itemImageView">NSImageView</string>
+						<string key="itemImageView">MPPopupImageView</string>
 						<string key="itemNameTextfield">NSTextField</string>
 						<string key="tabControl">NSSegmentedControl</string>
 						<string key="tabView">NSTabView</string>
@@ -1937,7 +1935,7 @@
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="itemImageView">
 							<string key="name">itemImageView</string>
-							<string key="candidateClassName">NSImageView</string>
+							<string key="candidateClassName">MPPopupImageView</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="itemNameTextfield">
 							<string key="name">itemNameTextfield</string>
diff --git a/MacPass/MPIconSelectViewController.h b/MacPass/MPIconSelectViewController.h
index 1072fe69..3585ab32 100644
--- a/MacPass/MPIconSelectViewController.h
+++ b/MacPass/MPIconSelectViewController.h
@@ -8,6 +8,6 @@
 
 #import "MPViewController.h"
 
-@interface MPIconSelectViewController : MPViewController
+@interface MPIconSelectViewController : MPViewController <NSCollectionViewDelegate>
 
 @end
diff --git a/MacPass/MPIconSelectViewController.m b/MacPass/MPIconSelectViewController.m
index 2eb5c56d..ee67a7f6 100644
--- a/MacPass/MPIconSelectViewController.m
+++ b/MacPass/MPIconSelectViewController.m
@@ -14,11 +14,16 @@
 
 @implementation MPIconSelectViewController
 
+
+- (id)init {
+  return [self initWithNibName:@"IconSelection" bundle:nil];
+}
+
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
-        // Initialization code here.
+
     }
     
     return self;
diff --git a/MacPass/MPInspectorTabViewController.m b/MacPass/MPInspectorTabViewController.m
index 10ca3bc3..1064df12 100644
--- a/MacPass/MPInspectorTabViewController.m
+++ b/MacPass/MPInspectorTabViewController.m
@@ -13,6 +13,7 @@
 #import "MPShadowBox.h"
 #import "MPIconHelper.h"
 #import "MPPopupImageView.h"
+#import "MPIconSelectViewController.h"
 #import "KdbLib.h"
 
 @interface MPInspectorTabViewController ()
@@ -28,6 +29,7 @@
 - (void)_updateContent;
 - (void)_clearContent;
 - (void)_setInputEnabled:(BOOL)enabled;
+- (void)_showImagePopup:(id)sender;
 
 @end
 
@@ -58,6 +60,7 @@
   [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
   [self.tabControl bind:NSSelectedIndexBinding toObject:self withKeyPath:@"selectedTabIndex" options:nil];
   [self.tabView bind:NSSelectedIndexBinding toObject:self withKeyPath:@"selectedTabIndex" options:nil];
+  [self.itemImageView setTarget:self];
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(_didChangeSelectedEntry:)
@@ -85,11 +88,23 @@
 }
 
 - (void)_setInputEnabled:(BOOL)enabled {
+
+  [self.itemImageView setAction: enabled ? @selector(_showImagePopup:) : NULL ];
   [self.itemImageView setEnabled:enabled];
   [self.itemNameTextfield setTextColor: enabled ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
   [self.itemNameTextfield setEnabled:enabled];
 }
 
+#pragma mark Actions
+
+- (void)_showImagePopup:(id)sender {
+  NSPopover *popover = [[NSPopover alloc] init];
+  popover.behavior = NSPopoverBehaviorTransient;
+  popover.contentViewController = [[[MPIconSelectViewController alloc] init] autorelease];
+  [popover showRelativeToRect:NSZeroRect ofView:self.itemImageView preferredEdge:NSMinYEdge];
+  [popover release];
+}
+
 #pragma mark Notificiations
 
 - (void)_didChangeSelectedEntry:(NSNotification *)notification {
diff --git a/MacPass/MPPopupImageView.m b/MacPass/MPPopupImageView.m
index e98bb634..d4ee020a 100644
--- a/MacPass/MPPopupImageView.m
+++ b/MacPass/MPPopupImageView.m
@@ -8,15 +8,15 @@
 
 #import "MPPopupImageView.h"
 
+#define MPTRIANGLE_HEIGHT 8
+#define MPTRIANGLE_WIDTH 10
+#define MPTRIANGLE_OFFSET 2
+
 @interface MPPopupImageView ()
 
 @property (assign) BOOL showOverlay;
-@property (retain) NSString *overlayText;
-@property (retain) NSDictionary *fontAttributes;
-@property (assign) NSSize textSize;
 
 - (void)_setupView;
-- (NSRect)_centeredFontRectangle;
 
 @end
 
@@ -41,20 +41,32 @@
 - (void)drawRect:(NSRect)dirtyRect
 {
   [super drawRect:dirtyRect];
-  if(self.showOverlay) {
+  if(self.showOverlay && [self isEnabled]) {
     [[NSGraphicsContext currentContext] saveGraphicsState];
-    NSRect rect = NSInsetRect([self bounds], 2, 14);
-    rect.origin.x = 2;
-    rect.origin.y = 14;
-    [[NSColor greenColor] set];
+
+
+    [[NSColor colorWithCalibratedWhite:0 alpha:0.2] set];
+    [[NSBezierPath bezierPathWithRoundedRect:[self bounds] xRadius:4 yRadius:4] fill];
+    
     NSShadow *shadow = [[NSShadow alloc] init];
     [shadow setShadowBlurRadius:2];
     [shadow setShadowOffset:NSMakeSize(0, -1)];
     [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0 alpha:0.5]];
     [shadow set];
+
+    NSBezierPath *triangle = [NSBezierPath bezierPath];
+    NSPoint left = NSMakePoint([self bounds].size.width - MPTRIANGLE_OFFSET - MPTRIANGLE_WIDTH, MPTRIANGLE_OFFSET + MPTRIANGLE_HEIGHT);
+    NSPoint right = NSMakePoint(left.x + MPTRIANGLE_WIDTH, left.y);
+    NSPoint bottom = NSMakePoint(left.x + 0.5 * MPTRIANGLE_WIDTH, MPTRIANGLE_OFFSET);
+  
+    [triangle moveToPoint:left];
+    [triangle lineToPoint:right];
+    [triangle lineToPoint:bottom];
+    [triangle closePath];
+    
     [[NSColor whiteColor] set];
-    NSRectFill([self _centeredFontRectangle]);
-    [self.overlayText drawInRect:[self _centeredFontRectangle] withAttributes:self.fontAttributes];
+    [triangle fill];
+    
     [shadow release];
     [[NSGraphicsContext currentContext] restoreGraphicsState];
   }
@@ -73,24 +85,11 @@
   [super mouseExited:theEvent];
 }
 
-- (NSRect)_centeredFontRectangle {
-  CGFloat leftMargin = floor( 0.5 * [self bounds].size.width - self.textSize.width );
-  CGFloat bottomMargin = floor( 0.5 * [self bounds].size.height - self.textSize.height);
-  return NSMakeRect(leftMargin, bottomMargin, self.textSize.width, self.textSize.height);
+- (void)mouseDown:(NSEvent *)theEvent {
+  [self sendAction:[self action] to:[self target]];
 }
 
 - (void)_setupView {
-  /* Setup font for drawing an precalulate some things */
-  _overlayText = [NSLocalizedString(@"CHANGE_IMAGE", @"Overlay text for popup image") retain];
-  NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-  paragraphStyle.alignment = NSCenterTextAlignment;
-  _fontAttributes = [@{
-                                   NSFontAttributeName :[NSFont boldSystemFontOfSize:11],
-                                   NSForegroundColorAttributeName : [NSColor whiteColor],
-                                   } retain];
-  [paragraphStyle release];
-  _textSize = [self.overlayText sizeWithAttributes:_fontAttributes];
-  
   /* Add tracking area for mouse events */
   NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds]
                                                               options:(NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow)
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 5963ed38..8458b52b 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>53C</string>
+	<string>550</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>