diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index e9503c88..a924845d 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -43,7 +43,7 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSTextField" id="782561359">
+					<object class="NSTextField" id="990836775">
 						<reference key="NSNextResponder" ref="233312071"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{57, 409}, {204, 17}}</string>
@@ -53,17 +53,17 @@
 						<string key="NSReuseIdentifierKey">_NS:1535</string>
 						<string key="NSAntiCompressionPriority">{249, 750}</string>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="284992550">
+						<object class="NSTextFieldCell" key="NSCell" id="673686414">
 							<int key="NSCellFlags">67108928</int>
 							<int key="NSCellFlags2">272636224</int>
 							<string key="NSContents">Label</string>
-							<object class="NSFont" key="NSSupport" id="235416468">
+							<object class="NSFont" key="NSSupport" id="240853158">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
 							<string key="NSCellIdentifier">_NS:1535</string>
-							<reference key="NSControlView" ref="782561359"/>
+							<reference key="NSControlView" ref="990836775"/>
 							<object class="NSColor" key="NSBackgroundColor" id="533509460">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
@@ -85,7 +85,7 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSImageView" id="479092623">
+					<object class="NSImageView" id="621131831">
 						<reference key="NSNextResponder" ref="233312071"/>
 						<int key="NSvFlags">268</int>
 						<set class="NSMutableSet" key="NSDragTypes">
@@ -99,10 +99,10 @@
 						<string key="NSFrame">{{20, 401}, {32, 32}}</string>
 						<reference key="NSSuperview" ref="233312071"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="782561359"/>
+						<reference key="NSNextKeyView" ref="990836775"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSImageCell" key="NSCell" id="608917379">
+						<object class="NSImageCell" key="NSCell" id="152819686">
 							<int key="NSCellFlags">134217728</int>
 							<int key="NSCellFlags2">33554432</int>
 							<object class="NSCustomResource" key="NSContents">
@@ -121,78 +121,11 @@
 					<object class="NSCustomView" id="381395509">
 						<reference key="NSNextResponder" ref="233312071"/>
 						<int key="NSvFlags">268</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSImageView" id="47551316">
-								<reference key="NSNextResponder" ref="381395509"/>
-								<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">{{20, 7}, {16, 16}}</string>
-								<reference key="NSSuperview" ref="381395509"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="687987001"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSImageCell" key="NSCell" id="982440531">
-									<int key="NSCellFlags">134217728</int>
-									<int key="NSCellFlags2">33554432</int>
-									<object class="NSCustomResource" key="NSContents">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">99_CreatedTemplate</string>
-									</object>
-									<string key="NSCellIdentifier">_NS:9</string>
-									<int key="NSAlign">0</int>
-									<int key="NSScale">0</int>
-									<int key="NSStyle">0</int>
-									<bool key="NSAnimates">NO</bool>
-								</object>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<bool key="NSEditable">YES</bool>
-							</object>
-							<object class="NSImageView" id="687987001">
-								<reference key="NSNextResponder" ref="381395509"/>
-								<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">{{131, 7}, {16, 16}}</string>
-								<reference key="NSSuperview" ref="381395509"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSImageCell" key="NSCell" id="16993625">
-									<int key="NSCellFlags">134217728</int>
-									<int key="NSCellFlags2">33554432</int>
-									<object class="NSCustomResource" key="NSContents">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">07_NotepadTemplate</string>
-									</object>
-									<string key="NSCellIdentifier">_NS:9</string>
-									<int key="NSAlign">0</int>
-									<int key="NSScale">0</int>
-									<int key="NSStyle">0</int>
-									<bool key="NSAnimates">NO</bool>
-								</object>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<bool key="NSEditable">YES</bool>
-							</object>
-						</array>
+						<array class="NSMutableArray" key="NSSubviews"/>
 						<string key="NSFrameSize">{278, 30}</string>
 						<reference key="NSSuperview" ref="233312071"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="47551316"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSClassName">HNHGradientView</string>
 					</object>
@@ -282,7 +215,7 @@
 							</object>
 						</array>
 						<reference key="NSSelectedTabViewItem" ref="950669860"/>
-						<reference key="NSFont" ref="235416468"/>
+						<reference key="NSFont" ref="240853158"/>
 						<int key="NSTvFlags">6</int>
 						<bool key="NSAllowTruncatedLabels">YES</bool>
 						<bool key="NSDrawsBackground">YES</bool>
@@ -294,7 +227,7 @@
 				<string key="NSFrameSize">{278, 443}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="479092623"/>
+				<reference key="NSNextKeyView" ref="621131831"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -309,22 +242,6 @@
 					</object>
 					<int key="connectionID">2976</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">modifiedImageView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="687987001"/>
-					</object>
-					<int key="connectionID">2662</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">createdImageView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="47551316"/>
-					</object>
-					<int key="connectionID">2661</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">noSelectionInfo</string>
@@ -353,7 +270,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">itemImageView</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="479092623"/>
+						<reference key="destination" ref="621131831"/>
 					</object>
 					<int key="connectionID">3024</int>
 				</object>
@@ -361,10 +278,18 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">itemNameTextField</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="782561359"/>
+						<reference key="destination" ref="990836775"/>
 					</object>
 					<int key="connectionID">3025</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showImagePopup:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="621131831"/>
+					</object>
+					<int key="connectionID">3095</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -460,11 +385,11 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="598069230">
+							<object class="IBNSLayoutConstraint" id="300317034">
 								<reference key="firstItem" ref="233312071"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="782561359"/>
+								<reference key="secondItem" ref="990836775"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -476,11 +401,11 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="413028037">
-								<reference key="firstItem" ref="782561359"/>
+							<object class="IBNSLayoutConstraint" id="857734432">
+								<reference key="firstItem" ref="990836775"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="479092623"/>
+								<reference key="secondItem" ref="621131831"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -492,11 +417,11 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="80082049">
-								<reference key="firstItem" ref="782561359"/>
+							<object class="IBNSLayoutConstraint" id="930543667">
+								<reference key="firstItem" ref="990836775"/>
 								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="479092623"/>
+								<reference key="secondItem" ref="621131831"/>
 								<int key="secondAttribute">10</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -508,7 +433,7 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="252691643">
+							<object class="IBNSLayoutConstraint" id="263318542">
 								<reference key="firstItem" ref="45251842"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -556,8 +481,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="201485775">
-								<reference key="firstItem" ref="479092623"/>
+							<object class="IBNSLayoutConstraint" id="627335830">
+								<reference key="firstItem" ref="621131831"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="233312071"/>
@@ -572,8 +497,8 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1036373301">
-								<reference key="firstItem" ref="479092623"/>
+							<object class="IBNSLayoutConstraint" id="544375755">
+								<reference key="firstItem" ref="621131831"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="233312071"/>
@@ -590,8 +515,8 @@
 							</object>
 							<reference ref="381395509"/>
 							<reference ref="45251842"/>
-							<reference ref="479092623"/>
-							<reference ref="782561359"/>
+							<reference ref="621131831"/>
+							<reference ref="990836775"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -646,86 +571,6 @@
 						<int key="objectID">2930</int>
 						<reference key="object" ref="381395509"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="300007741">
-								<reference key="firstItem" ref="687987001"/>
-								<int key="firstAttribute">9</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="381395509"/>
-								<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="381395509"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="88408565">
-								<reference key="firstItem" ref="687987001"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="381395509"/>
-								<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="381395509"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="402635443">
-								<reference key="firstItem" ref="47551316"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="687987001"/>
-								<int key="secondAttribute">4</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="381395509"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="60523924">
-								<reference key="firstItem" ref="47551316"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="381395509"/>
-								<int key="secondAttribute">5</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="381395509"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="808022187">
-								<reference key="firstItem" ref="47551316"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="687987001"/>
-								<int key="secondAttribute">3</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="381395509"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="574545128">
 								<reference key="firstItem" ref="381395509"/>
 								<int key="firstAttribute">8</int>
@@ -742,8 +587,6 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
 							</object>
-							<reference ref="47551316"/>
-							<reference ref="687987001"/>
 						</array>
 						<reference key="parent" ref="233312071"/>
 					</object>
@@ -784,7 +627,7 @@
 						<int key="objectID">2975</int>
 						<reference key="object" ref="176793183"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="721949088">
+							<object class="IBNSLayoutConstraint" id="88408565">
 								<reference key="firstItem" ref="390171337"/>
 								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
@@ -820,120 +663,6 @@
 						</array>
 						<reference key="parent" ref="950669860"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2651</int>
-						<reference key="object" ref="687987001"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="16993625"/>
-							<object class="IBNSLayoutConstraint" id="269961098">
-								<reference key="firstItem" ref="687987001"/>
-								<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">16</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="687987001"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="381395509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2654</int>
-						<reference key="object" ref="16993625"/>
-						<reference key="parent" ref="687987001"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2652</int>
-						<reference key="object" ref="269961098"/>
-						<reference key="parent" ref="687987001"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2979</int>
-						<reference key="object" ref="88408565"/>
-						<reference key="parent" ref="381395509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2632</int>
-						<reference key="object" ref="47551316"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="458335359">
-								<reference key="firstItem" ref="47551316"/>
-								<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">16</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="47551316"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="38589138">
-								<reference key="firstItem" ref="47551316"/>
-								<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">16</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="47551316"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-							<reference ref="982440531"/>
-						</array>
-						<reference key="parent" ref="381395509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2646</int>
-						<reference key="object" ref="458335359"/>
-						<reference key="parent" ref="47551316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2648</int>
-						<reference key="object" ref="38589138"/>
-						<reference key="parent" ref="47551316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2633</int>
-						<reference key="object" ref="982440531"/>
-						<reference key="parent" ref="47551316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2981</int>
-						<reference key="object" ref="808022187"/>
-						<reference key="parent" ref="381395509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2982</int>
-						<reference key="object" ref="60523924"/>
-						<reference key="parent" ref="381395509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2983</int>
-						<reference key="object" ref="402635443"/>
-						<reference key="parent" ref="381395509"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2984</int>
-						<reference key="object" ref="300007741"/>
-						<reference key="parent" ref="381395509"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2985</int>
 						<reference key="object" ref="390171337"/>
@@ -949,11 +678,11 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2998</int>
-						<reference key="object" ref="479092623"/>
+						<reference key="object" ref="621131831"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="608917379"/>
-							<object class="IBNSLayoutConstraint" id="335332798">
-								<reference key="firstItem" ref="479092623"/>
+							<reference ref="152819686"/>
+							<object class="IBNSLayoutConstraint" id="148575421">
+								<reference key="firstItem" ref="621131831"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -963,13 +692,13 @@
 									<double key="value">32</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="479092623"/>
+								<reference key="containingView" ref="621131831"/>
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="306693022">
-								<reference key="firstItem" ref="479092623"/>
+							<object class="IBNSLayoutConstraint" id="418732131">
+								<reference key="firstItem" ref="621131831"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -979,7 +708,7 @@
 									<double key="value">32</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="479092623"/>
+								<reference key="containingView" ref="621131831"/>
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
@@ -989,21 +718,21 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2999</int>
-						<reference key="object" ref="608917379"/>
-						<reference key="parent" ref="479092623"/>
+						<reference key="object" ref="152819686"/>
+						<reference key="parent" ref="621131831"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3013</int>
-						<reference key="object" ref="782561359"/>
+						<reference key="object" ref="990836775"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="284992550"/>
+							<reference ref="673686414"/>
 						</array>
 						<reference key="parent" ref="233312071"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3014</int>
-						<reference key="object" ref="284992550"/>
-						<reference key="parent" ref="782561359"/>
+						<reference key="object" ref="673686414"/>
+						<reference key="parent" ref="990836775"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2991</int>
@@ -1012,47 +741,47 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3023</int>
-						<reference key="object" ref="721949088"/>
+						<reference key="object" ref="88408565"/>
 						<reference key="parent" ref="176793183"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3027</int>
-						<reference key="object" ref="306693022"/>
-						<reference key="parent" ref="479092623"/>
+						<reference key="object" ref="418732131"/>
+						<reference key="parent" ref="621131831"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3028</int>
-						<reference key="object" ref="335332798"/>
-						<reference key="parent" ref="479092623"/>
+						<reference key="object" ref="148575421"/>
+						<reference key="parent" ref="621131831"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3068</int>
-						<reference key="object" ref="252691643"/>
+						<reference key="object" ref="263318542"/>
 						<reference key="parent" ref="233312071"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3069</int>
-						<reference key="object" ref="80082049"/>
+						<reference key="object" ref="930543667"/>
 						<reference key="parent" ref="233312071"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3072</int>
-						<reference key="object" ref="1036373301"/>
+						<reference key="object" ref="544375755"/>
 						<reference key="parent" ref="233312071"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3073</int>
-						<reference key="object" ref="413028037"/>
+						<reference key="object" ref="857734432"/>
 						<reference key="parent" ref="233312071"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3076</int>
-						<reference key="object" ref="201485775"/>
+						<reference key="object" ref="627335830"/>
 						<reference key="parent" ref="233312071"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3075</int>
-						<reference key="object" ref="598069230"/>
+						<reference key="object" ref="300317034"/>
 						<reference key="parent" ref="233312071"/>
 					</object>
 				</array>
@@ -1061,31 +790,15 @@
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="2632.IBNSViewMetadataConstraints">
-					<reference ref="458335359"/>
-					<reference ref="38589138"/>
-				</array>
-				<boolean value="NO" key="2632.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="2632.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2633.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2646.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2648.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="2651.IBNSViewMetadataConstraints">
-					<reference ref="269961098"/>
-				</array>
-				<boolean value="NO" key="2651.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="2651.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2654.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="2894.IBNSViewMetadataConstraints">
-					<reference ref="1036373301"/>
-					<reference ref="201485775"/>
+					<reference ref="544375755"/>
+					<reference ref="627335830"/>
 					<reference ref="22318682"/>
 					<reference ref="578777475"/>
-					<reference ref="252691643"/>
-					<reference ref="80082049"/>
-					<reference ref="413028037"/>
-					<reference ref="598069230"/>
+					<reference ref="263318542"/>
+					<reference ref="930543667"/>
+					<reference ref="857734432"/>
+					<reference ref="300317034"/>
 					<reference ref="112302846"/>
 					<reference ref="26385821"/>
 					<reference ref="938170426"/>
@@ -1110,11 +823,6 @@
 				<string key="2929.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="2930.IBNSViewMetadataConstraints">
 					<reference ref="574545128"/>
-					<reference ref="808022187"/>
-					<reference ref="60523924"/>
-					<reference ref="402635443"/>
-					<reference ref="88408565"/>
-					<reference ref="300007741"/>
 				</array>
 				<boolean value="NO" key="2930.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="2930.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1126,22 +834,17 @@
 				<string key="2974.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="2975.IBNSViewMetadataConstraints">
 					<reference ref="998507707"/>
-					<reference ref="721949088"/>
+					<reference ref="88408565"/>
 				</array>
 				<string key="2975.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2979.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2981.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2982.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2983.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2984.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="2985.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="2985.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2986.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2991.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2998.CustomClassName">MPPopupImageView</string>
 				<array class="NSMutableArray" key="2998.IBNSViewMetadataConstraints">
-					<reference ref="306693022"/>
-					<reference ref="335332798"/>
+					<reference ref="418732131"/>
+					<reference ref="148575421"/>
 				</array>
 				<boolean value="NO" key="2998.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="2998.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1163,7 +866,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">3078</int>
+			<int key="maxID">3095</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1178,13 +881,22 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MPInspectorViewController</string>
 					<string key="superclassName">MPViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">showImagePopup:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showImagePopup:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showImagePopup:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="bottomBar">HNHGradientView</string>
-						<string key="createdImageView">NSImageView</string>
 						<string key="createdTextField">NSTextField</string>
 						<string key="itemImageView">MPPopupImageView</string>
 						<string key="itemNameTextField">NSTextField</string>
-						<string key="modifiedImageView">NSImageView</string>
 						<string key="modifiedTextField">NSTextField</string>
 						<string key="noSelectionInfo">NSTextField</string>
 						<string key="tabView">NSTabView</string>
@@ -1194,10 +906,6 @@
 							<string key="name">bottomBar</string>
 							<string key="candidateClassName">HNHGradientView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="createdImageView">
-							<string key="name">createdImageView</string>
-							<string key="candidateClassName">NSImageView</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="createdTextField">
 							<string key="name">createdTextField</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -1210,10 +918,6 @@
 							<string key="name">itemNameTextField</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="modifiedImageView">
-							<string key="name">modifiedImageView</string>
-							<string key="candidateClassName">NSImageView</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="modifiedTextField">
 							<string key="name">modifiedTextField</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -1262,11 +966,10 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="07_NotepadTemplate">{128, 128}</string>
-			<string key="99_CreatedTemplate">{128, 128}</string>
-			<string key="NSActionTemplate">{15, 15}</string>
-		</dictionary>
+		<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/IconSelection.xib b/MacPass/IconSelection.xib
index 6aba471d..b2d06fcf 100644
--- a/MacPass/IconSelection.xib
+++ b/MacPass/IconSelection.xib
@@ -45,7 +45,7 @@
 					<object class="NSButton" id="317760263">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{147, 18}, {118, 25}}</string>
+						<string key="NSFrame">{{182, 18}, {118, 25}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:22</string>
@@ -81,7 +81,7 @@
 									<object class="NSCollectionView" id="697027275">
 										<reference key="NSNextResponder" ref="785205210"/>
 										<int key="NSvFlags">4370</int>
-										<string key="NSFrameSize">{243, 238}</string>
+										<string key="NSFrameSize">{300, 250}</string>
 										<reference key="NSSuperview" ref="785205210"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="319187659"/>
@@ -105,7 +105,7 @@
 										<int key="NSDraggingSourceMaskForNonLocal">0</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{1, 1}, {243, 238}}</string>
+								<string key="NSFrameSize">{300, 250}</string>
 								<reference key="NSSuperview" ref="170990502"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="697027275"/>
@@ -151,12 +151,12 @@
 								<double key="NSPercent">0.63157892227172852</double>
 							</object>
 						</array>
-						<string key="NSFrame">{{20, 50}, {245, 240}}</string>
+						<string key="NSFrame">{{10, 50}, {300, 250}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="785205210"/>
 						<string key="NSReuseIdentifierKey">_NS:76</string>
-						<int key="NSsFlags">133682</int>
+						<int key="NSsFlags">133680</int>
 						<reference key="NSVScroller" ref="319187659"/>
 						<reference key="NSHScroller" ref="775158265"/>
 						<reference key="NSContentView" ref="785205210"/>
@@ -165,7 +165,7 @@
 						<double key="NSMagnification">1</double>
 					</object>
 				</array>
-				<string key="NSFrameSize">{285, 310}</string>
+				<string key="NSFrameSize">{320, 310}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="170990502"/>
@@ -179,7 +179,7 @@
 					<object class="NSButton" id="612603831">
 						<reference key="NSNextResponder" ref="340719917"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{10, 10}, {40, 40}}</string>
+						<string key="NSFrame">{{9, 9}, {32, 32}}</string>
 						<reference key="NSSuperview" ref="340719917"/>
 						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -191,8 +191,8 @@
 							<reference key="NSSupport" ref="747112258"/>
 							<string key="NSCellIdentifier">_NS:9</string>
 							<reference key="NSControlView" ref="612603831"/>
-							<int key="NSButtonFlags">-2039201792</int>
-							<int key="NSButtonFlags2">65</int>
+							<int key="NSButtonFlags">141836288</int>
+							<int key="NSButtonFlags2">66</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSAddTemplate</string>
@@ -205,7 +205,7 @@
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{60, 60}</string>
+				<string key="NSFrameSize">{50, 50}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="612603831"/>
@@ -255,6 +255,22 @@
 					</object>
 					<int key="connectionID">128</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">image: representedObject</string>
+						<reference key="source" ref="612603831"/>
+						<reference key="destination" ref="417473882"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="612603831"/>
+							<reference key="NSDestination" ref="417473882"/>
+							<string key="NSLabel">image: representedObject</string>
+							<string key="NSBinding">image</string>
+							<string key="NSKeyPath">representedObject</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">139</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -286,7 +302,6 @@
 						<int key="objectID">1</int>
 						<reference key="object" ref="1005"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="170990502"/>
 							<object class="IBNSLayoutConstraint" id="494913411">
 								<reference key="firstItem" ref="317760263"/>
 								<int key="firstAttribute">3</int>
@@ -342,13 +357,13 @@
 								<reference key="secondItem" ref="1005"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">10</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">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="523638618">
@@ -358,13 +373,13 @@
 								<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">10</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">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="655672626">
@@ -374,16 +389,17 @@
 								<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">10</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">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<reference ref="317760263"/>
+							<reference ref="170990502"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -417,11 +433,6 @@
 						<reference key="object" ref="417473882"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">88</int>
-						<reference key="object" ref="655672626"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">101</int>
 						<reference key="object" ref="317760263"/>
@@ -450,11 +461,6 @@
 						<reference key="object" ref="523638618"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">111</int>
-						<reference key="object" ref="1060216757"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">112</int>
 						<reference key="object" ref="494913411"/>
@@ -464,27 +470,11 @@
 						<int key="objectID">113</int>
 						<reference key="object" ref="340719917"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="436230129">
-								<reference key="firstItem" ref="340719917"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="612603831"/>
-								<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="340719917"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="766436605">
-								<reference key="firstItem" ref="340719917"/>
+							<object class="IBNSLayoutConstraint" id="528411379">
+								<reference key="firstItem" ref="612603831"/>
 								<int key="firstAttribute">9</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="612603831"/>
+								<reference key="secondItem" ref="340719917"/>
 								<int key="secondAttribute">9</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -492,8 +482,24 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="340719917"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="926242244">
+								<reference key="firstItem" ref="612603831"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="340719917"/>
+								<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="340719917"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
 								<int key="contentType">2</int>
 							</object>
 							<reference ref="612603831"/>
@@ -505,7 +511,7 @@
 						<reference key="object" ref="612603831"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="344314901"/>
-							<object class="IBNSLayoutConstraint" id="463236706">
+							<object class="IBNSLayoutConstraint" id="1004322278">
 								<reference key="firstItem" ref="612603831"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
@@ -513,7 +519,7 @@
 								<int key="secondAttribute">0</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">40</double>
+									<double key="value">32</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="612603831"/>
@@ -521,7 +527,7 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="477773969">
+							<object class="IBNSLayoutConstraint" id="1006496299">
 								<reference key="firstItem" ref="612603831"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
@@ -529,7 +535,7 @@
 								<int key="secondAttribute">0</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">40</double>
+									<double key="value">32</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="612603831"/>
@@ -546,23 +552,33 @@
 						<reference key="parent" ref="612603831"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">121</int>
-						<reference key="object" ref="477773969"/>
+						<int key="objectID">88</int>
+						<reference key="object" ref="655672626"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="1060216757"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">148</int>
+						<reference key="object" ref="1006496299"/>
 						<reference key="parent" ref="612603831"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">123</int>
-						<reference key="object" ref="463236706"/>
+						<int key="objectID">149</int>
+						<reference key="object" ref="1004322278"/>
 						<reference key="parent" ref="612603831"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">126</int>
-						<reference key="object" ref="766436605"/>
+						<int key="objectID">150</int>
+						<reference key="object" ref="926242244"/>
 						<reference key="parent" ref="340719917"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">127</int>
-						<reference key="object" ref="436230129"/>
+						<int key="objectID">151</int>
+						<reference key="object" ref="528411379"/>
 						<reference key="parent" ref="340719917"/>
 					</object>
 				</array>
@@ -589,21 +605,23 @@
 				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="113.IBNSViewMetadataConstraints">
-					<reference ref="766436605"/>
-					<reference ref="436230129"/>
+					<reference ref="926242244"/>
+					<reference ref="528411379"/>
 				</array>
+				<boolean value="YES" key="113.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="113.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="114.IBNSViewMetadataConstraints">
-					<reference ref="477773969"/>
-					<reference ref="463236706"/>
+				<array class="NSMutableArray" key="114.IBNSViewMetadataConstraints">
+					<reference ref="1006496299"/>
+					<reference ref="1004322278"/>
 				</array>
 				<boolean value="NO" key="114.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="114.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="127.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="57.CustomClassName">HNHScrollView</string>
 				<boolean value="NO" key="57.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<reference key="58.IBCollectionViewIntegration.primaryColor" ref="228713979"/>
@@ -617,10 +635,18 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">133</int>
+			<int key="maxID">151</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">HNHScrollView</string>
+					<string key="superclassName">NSScrollView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/HNHScrollView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">MPIconSelectViewController</string>
 					<string key="superclassName">MPViewController</string>
@@ -635,17 +661,20 @@
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">iconCollectionView</string>
-						<string key="NS.object.0">NSCollectionView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">iconCollectionView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="iconCollectionView">NSCollectionView</string>
+						<string key="imageButton">NSButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="iconCollectionView">
 							<string key="name">iconCollectionView</string>
 							<string key="candidateClassName">NSCollectionView</string>
 						</object>
-					</object>
+						<object class="IBToOneOutletInfo" key="imageButton">
+							<string key="name">imageButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/MPIconSelectViewController.h</string>
@@ -659,27 +688,6 @@
 						<string key="minorKey">./Classes/MPViewController.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSCollectionViewItem</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="imageView">NSImageView</string>
-						<string key="textField">NSTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="imageView">
-							<string key="name">imageView</string>
-							<string key="candidateClassName">NSImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField">
-							<string key="name">textField</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSCollectionViewItem.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSLayoutConstraint</string>
 					<string key="superclassName">NSObject</string>
diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m
index e1c9874c..9017afc3 100644
--- a/MacPass/MPEntryInspectorViewController.m
+++ b/MacPass/MPEntryInspectorViewController.m
@@ -196,10 +196,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
 #pragma mark -
 #pragma mark Popovers
 
-//- (void)_showImagePopup:(id)sender {
-//  [self _showPopopver:[[MPIconSelectViewController alloc] init]  atView:self.itemImageView onEdge:NSMinYEdge];
-//}
-//
 - (IBAction)_popUpPasswordGenerator:(id)sender {
   [self.generatePasswordButton setEnabled:NO];
   [self _showPopopver:[[MPPasswordCreatorViewController alloc] init] atView:self.passwordTextField onEdge:NSMinYEdge];
diff --git a/MacPass/MPIconSelectViewController.h b/MacPass/MPIconSelectViewController.h
index bbde1223..af028216 100644
--- a/MacPass/MPIconSelectViewController.h
+++ b/MacPass/MPIconSelectViewController.h
@@ -11,6 +11,8 @@
 @interface MPIconSelectViewController : MPViewController <NSCollectionViewDelegate>
 
 @property (weak) IBOutlet NSCollectionView *iconCollectionView;
+@property (weak) IBOutlet NSButton *imageButton;
+
 - (IBAction)useDefault:(id)sender;
 
 @end
diff --git a/MacPass/MPIconSelectViewController.m b/MacPass/MPIconSelectViewController.m
index 336d1d18..2205602c 100644
--- a/MacPass/MPIconSelectViewController.m
+++ b/MacPass/MPIconSelectViewController.m
@@ -10,7 +10,6 @@
 #import "MPIconHelper.h"
 
 @interface MPIconSelectViewController ()
-
 @end
 
 @implementation MPIconSelectViewController
@@ -20,19 +19,20 @@
   return [self initWithNibName:@"IconSelection" bundle:nil];
 }
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
-      
     }
     return self;
 }
 
 - (void)didLoadView {
+  //[[self.imageButton cell] setBackgroundStyle:NSBackgroundStyleLowered];
+  [self.iconCollectionView setBackgroundColors:@[[NSColor clearColor]]];
   [self.iconCollectionView setSelectable:YES];
   [self.iconCollectionView setAllowsMultipleSelection:NO];
   [self.iconCollectionView setContent:[MPIconHelper availableIcons]];
+  
 }
 
 - (IBAction)useDefault:(id)sender {
diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h
index ee65fc44..a0c2f858 100644
--- a/MacPass/MPInspectorViewController.h
+++ b/MacPass/MPInspectorViewController.h
@@ -11,17 +11,17 @@
 @class HNHGradientView;
 @class MPPopupImageView;
 
-@interface MPInspectorViewController : MPViewController
+@interface MPInspectorViewController : MPViewController <NSPopoverDelegate>
 
 @property (weak) IBOutlet HNHGradientView *bottomBar;
 @property (weak) IBOutlet NSTextField *createdTextField;
 @property (weak) IBOutlet NSTextField *modifiedTextField;
-@property (weak) IBOutlet NSImageView *modifiedImageView;
-@property (weak) IBOutlet NSImageView *createdImageView;
 @property (weak) IBOutlet NSTextField *noSelectionInfo;
 @property (weak) IBOutlet MPPopupImageView *itemImageView;
 @property (weak) IBOutlet NSTextField *itemNameTextField;
 
+- (IBAction)showImagePopup:(id)sender;
+
 /* Seperate call to ensure alle registered objects are in place */
 - (void)setupNotifications:(NSWindowController *)windowController;
 
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index f7c2a130..7648abf2 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -12,6 +12,7 @@
 #import "MPGroupInspectorViewController.h"
 #import "MPDocument.h"
 #import "MPNotifications.h"
+#import "MPIconSelectViewController.h"
 
 #import "NSDate+Humanized.h"
 
@@ -31,6 +32,7 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
 @interface MPInspectorViewController () {
   MPEntryInspectorViewController *_entryViewController;
   MPGroupInspectorViewController *_groupViewController;
+  NSPopover *_popover;
 }
 
 @property (nonatomic, strong) NSDate *modificationDate;
@@ -130,6 +132,23 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
   
 }
 
+#pragma mark -
+#pragma mark Popup
+- (IBAction)showImagePopup:(id)sender {
+  
+  NSAssert(_popover == nil, @"Popover hast to be niled out");
+  _popover = [[NSPopover alloc] init];
+  _popover.delegate = self;
+  _popover.behavior = NSPopoverBehaviorTransient;
+  _popover.contentViewController = [[MPIconSelectViewController alloc] init];
+  [_popover showRelativeToRect:NSZeroRect ofView:self.itemImageView preferredEdge:NSMinYEdge];
+}
+
+- (void)popoverDidClose:(NSNotification *)notification {
+  _popover = nil;
+}
+
+
 #pragma mark -
 #pragma mark Item Binding