diff --git a/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.m b/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.m
index 4778f98..471f296 100644
--- a/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.m
+++ b/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.m
@@ -41,6 +41,7 @@ @interface XCActionBarWindowController () <XCActionBarCommandProcessor, NSTableV
 @property (weak) IBOutlet NSLayoutConstraint *searchFieldBottomConstraint;
 @property (weak) IBOutlet NSLayoutConstraint *searchResultsTableHeightConstraint;
 @property (weak) IBOutlet NSLayoutConstraint *searchResultsTableBottomConstraint;
+@property (strong) XCSearchResultCell *prototypeResultCell;
 
 @property (nonatomic) NSArray *searchResults;
 
@@ -78,14 +79,17 @@ - (void)windowDidLoad
 
     self.commandHandlers = @{XCSearchInputHandlerKey:   [[XCActionBarSearchStateCommandHandler alloc] initWithCommandProcessor:self],
                              XCArgumentInputHandlerKey: [[XCActionBarArgumentInputStateCommandHandler alloc] initWithCommandProcessor:self]};
+    
 
     self.searchField.focusRingType = NSFocusRingTypeNone;
     self.searchField.delegate      = self;
     self.searchField.nextResponder = self;
-    
+    self.searchField.layer.borderColor = [[NSColor controlColor] CGColor];
     self.searchResultsTable.rowSizeStyle            = NSTableViewRowSizeStyleCustom;
-    self.searchResultsTable.selectionHighlightStyle = NSTableViewSelectionHighlightStyleRegular;
-    self.searchResultsTable.rowHeight               = 50.0;
+    self.searchField.layer.borderWidth = 1.0;
+    self.searchField.layer.backgroundColor = [[NSColor whiteColor] CGColor];
+    self.searchField.layer.cornerRadius = 3.0;
+    self.searchField.layer.masksToBounds = YES;
     
     self.searchResultsTable.target       = self;
     self.searchResultsTable.doubleAction = @selector(processDoubleClickOnSearchResult:);
@@ -195,46 +199,53 @@ - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColu
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
     XCSearchResultCell *cell = [tableView makeViewWithIdentifier:NSStringFromClass([XCSearchResultCell class]) owner:self];
-    
+    [self configureCell:cell forRow:row];
+    return cell;
+}
+
+- (void)configureCell:(XCSearchResultCell *)cell forRow:(NSUInteger)row
+{
     id<XCActionInterface> action = self.searchResults[row];
 
     NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:TRSafeString(action.title)];
-    
+
     [title addAttribute:NSForegroundColorAttributeName
                   value:(action.enabled ? [NSColor blackColor] : [NSColor darkGrayColor])
                   range:NSMakeRange(0, title.length)];
-    
+
     for(NSValue *rangeValue in action.searchQueryMatchRanges) {
         [title addAttributes:@{NSBackgroundColorAttributeName:[NSColor colorWithCalibratedRed:1.000 green:1.000 blue:0.519 alpha:0.250],
                                NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
                                NSUnderlineColorAttributeName: [NSColor yellowColor]}
                        range:rangeValue.rangeValue];
     }
-    
+
     cell.textField.allowsEditingTextAttributes = YES;
-    
+
     cell.textField.attributedStringValue = title;
     cell.hintTextField.stringValue       = TRSafeString(action.hint);
     
     if([action acceptsArguments] == YES) {
-//        NSString *summaryWithMarker = [NSString stringWithFormat:@"%@ %@", @"\uf11c", TRSafeString(action.subtitle)];
-//        NSMutableAttributedString *summary = [[NSMutableAttributedString alloc] initWithString:summaryWithMarker];
-//        [summary addAttributes:@{NSFontAttributeName: XCFontAwesomeWithSize(12.0)}
-//                         range:NSMakeRange(0, 1)];
-//        cell.subtitleTextField.allowsEditingTextAttributes = YES;
-//        cell.subtitleTextField.attributedStringValue       = summary;
-        
-        cell.subtitleTextField.stringValue = [NSString stringWithFormat:@"%@ %@", @"\u21e5", TRSafeString(action.subtitle)];
+        cell.subtitleTextField.stringValue   = TRSafeString(action.subtitle);
+        cell.iconImageView.image = action.icon;
     }
-    else cell.subtitleTextField.stringValue   = TRSafeString(action.subtitle);
-    
+}
+
+- (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row
+{
+    if (self.prototypeResultCell == nil)
+    {
+        self.prototypeResultCell = [self.searchResultsTable makeViewWithIdentifier:NSStringFromClass([XCSearchResultCell class]) owner:self];
+    }
+
+    [self configureCell:self.prototypeResultCell forRow:row];
+    [self.prototypeResultCell layoutSubtreeIfNeeded];
     
-    return cell;
+    return self.prototypeResultCell.fittingSize.height;
 }
 
 #pragma mark - Public Methods
 
-
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 - (void)updateSearchResults:(NSArray *)results
@@ -420,13 +431,16 @@ - (void)selectSearchResultAtIndex:(NSInteger)indexToSelect
 - (void)resizeWindowToAccomodateSearchResults
 {
     if(TRCheckIsEmpty(self.searchResults) == NO) {
-        [[self.searchResultsTable animator] setAlphaValue:1.0];
-        
         self.searchResultsTable.hidden = NO;
-        self.searchResultsTableBottomConstraint.constant = 10.0;
-        self.searchResultsTableHeightConstraint.constant = 250.0;
-        
-        [self.searchField layoutSubtreeIfNeeded];
+        self.searchResultsTableBottomConstraint.constant = 0.0;
+
+        [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+            context.duration = 0.26;
+            self.searchResultsTable.animator.alphaValue = 1.0;
+            self.searchResultsTableHeightConstraint.animator.constant = MIN(self.searchResultsTable.rowHeight * self.searchResults.count, self.searchResultsTable.rowHeight * 6);
+
+            [self.searchField layoutSubtreeIfNeeded];
+        } completionHandler:nil];
     }
     else [self restoreWindowSize];
 }
@@ -435,13 +449,18 @@ - (void)resizeWindowToAccomodateSearchResults
 ////////////////////////////////////////////////////////////////////////////////
 - (void)restoreWindowSize
 {
-    [[self.searchResultsTable animator] setAlphaValue:0.0];
-    
-    self.searchResultsTable.hidden = YES;
-    self.searchResultsTableBottomConstraint.constant = 0.0;
-    self.searchResultsTableHeightConstraint.constant = 0.0;
-    
-    [self.window.contentView layoutSubtreeIfNeeded];
+    [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+        context.duration = 0.16;
+        self.searchResultsTable.animator.alphaValue = 0.0;
+        self.searchResultsTableHeightConstraint.constant = 0.0;
+        [self.window.contentView layoutSubtreeIfNeeded];
+
+    } completionHandler:^{
+        self.searchResultsTableBottomConstraint.constant = 0.0;
+        self.searchResultsTable.hidden = YES;
+
+        [self.window.contentView layoutSubtreeIfNeeded];
+    }];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.xib b/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.xib
index 15f1a5e..c99c6d2 100644
--- a/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.xib
+++ b/PGXcodeActionBrowser/Controllers/XCActionBarWindowController.xib
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="14D130a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="XCActionBarWindowController">
             <connections>
-                <outlet property="searchField" destination="0nc-H3-qNB" id="dVN-Hd-h3t"/>
+                <outlet property="searchField" destination="Sj8-VF-nKp" id="Ctl-Qz-XAk"/>
+                <outlet property="searchFieldBottomConstraint" destination="LKt-zH-pkt" id="B06-hX-Ia3"/>
                 <outlet property="searchResultsTable" destination="Xbd-j1-ucx" id="C3t-ld-D0f"/>
                 <outlet property="searchResultsTableBottomConstraint" destination="7KD-xR-JKN" id="4gT-W5-Z7O"/>
                 <outlet property="searchResultsTableHeightConstraint" destination="IQh-Jt-QWa" id="ecX-7R-NYr"/>
@@ -18,41 +19,37 @@
         <window title="Action Browser" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="XCRoundCornerWindow">
             <windowStyleMask key="styleMask" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="480" height="152"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+            <rect key="contentRect" x="196" y="240" width="480" height="138"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <value key="minSize" type="size" width="480" height="32"/>
-            <view key="contentView" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="152"/>
+            <view key="contentView" id="EiT-Mj-1SZ" customClass="NSVisualEffectView">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="138"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0nc-H3-qNB">
-                        <rect key="frame" x="10" y="112" width="460" height="30"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="30" id="KEA-bY-vN5"/>
-                        </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" placeholderString="Action ..." bezelStyle="round" id="9OQ-Mv-aFx">
-                            <font key="font" metaFont="system" size="15"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="nc0-Yx-xE7">
+                        <rect key="frame" x="455" y="112" width="14" height="14"/>
+                        <buttonCell key="cell" type="square" title="Inline Button" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="only" alignment="center" inset="2" id="HHb-m1-b4F">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
                         <connections>
-                            <outlet property="delegate" destination="-2" id="lFJ-Ao-YET"/>
+                            <action selector="clearSearchField:" target="-2" id="R00-Ry-IKa"/>
                         </connections>
-                    </textField>
-                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1CY-u2-UVN">
-                        <rect key="frame" x="10" y="10" width="460" height="100"/>
+                    </button>
+                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="56" horizontalPageScroll="10" verticalLineScroll="56" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1CY-u2-UVN">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="100"/>
                         <clipView key="contentView" drawsBackground="NO" id="TSv-zx-jAE">
                             <rect key="frame" x="1" y="0.0" width="238" height="134"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <tableView appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" id="Xbd-j1-ucx">
+                                <tableView appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="Xbd-j1-ucx">
                                     <autoresizingMask key="autoresizingMask"/>
-                                    <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" red="0.90196079015731812" green="0.90196079015731812" blue="0.90196079015731812" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
-                                    <tableViewGridLines key="gridStyleMask" dashed="YES"/>
-                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <size key="intercellSpacing" width="0.0" height="1"/>
+                                    <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <tableViewGridLines key="gridStyleMask" horizontal="YES"/>
+                                    <color key="gridColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn identifier="XCSearchResultCell" width="457" minWidth="40" maxWidth="1000" id="9ij-ym-eaJ">
+                                        <tableColumn identifier="XCSearchResultCell" width="480" minWidth="40" maxWidth="1000" id="9ij-ym-eaJ">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -66,44 +63,44 @@
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
                                                 <tableCellView id="ovL-S6-x5C" customClass="XCSearchResultCell">
-                                                    <rect key="frame" x="1" y="1" width="457" height="60"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="480" height="55"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="HGN-mS-EF8" userLabel="Title">
-                                                            <rect key="frame" x="0.0" y="43" width="397" height="17"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Search match..." id="L5n-tm-jNd">
-                                                                <font key="font" metaFont="systemBold"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="wSU-uZ-awN" userLabel="Hint">
+                                                            <rect key="frame" x="419" y="28" width="59" height="17"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Hint Text" usesSingleLineMode="YES" id="m8f-Md-aOi">
+                                                                <font key="font" metaFont="system"/>
+                                                                <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="wSU-uZ-awN" userLabel="Hint">
-                                                            <rect key="frame" x="398" y="43" width="59" height="17"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Hint Text" id="m8f-Md-aOi">
-                                                                <font key="font" metaFont="system"/>
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="HGN-mS-EF8" userLabel="Title">
+                                                            <rect key="frame" x="6" y="27" width="409" height="18"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Search match..." usesSingleLineMode="YES" id="L5n-tm-jNd">
+                                                                <font key="font" metaFont="system" size="15"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Koj-Zl-GJu" userLabel="Subtitle">
-                                                            <rect key="frame" x="0.0" y="24" width="459" height="17"/>
-                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Context" id="6M6-w8-tbh">
-                                                                <font key="font" metaFont="system"/>
+                                                            <rect key="frame" x="6" y="11" width="472" height="16"/>
+                                                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Context" usesSingleLineMode="YES" id="6M6-w8-tbh">
+                                                                <font key="font" metaFont="cellTitle"/>
                                                                 <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
                                                     </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="trailing" secondItem="Koj-Zl-GJu" secondAttribute="trailing" id="4b3-Bn-br8"/>
-                                                        <constraint firstItem="Koj-Zl-GJu" firstAttribute="top" secondItem="HGN-mS-EF8" secondAttribute="bottom" constant="2" id="BEl-MF-g0t"/>
-                                                        <constraint firstItem="HGN-mS-EF8" firstAttribute="top" secondItem="ovL-S6-x5C" secondAttribute="top" id="TCH-M5-5oh"/>
-                                                        <constraint firstAttribute="trailing" secondItem="wSU-uZ-awN" secondAttribute="trailing" constant="2" id="kUJ-oO-cwe"/>
-                                                        <constraint firstItem="Koj-Zl-GJu" firstAttribute="leading" secondItem="ovL-S6-x5C" secondAttribute="leading" constant="2" id="kdj-58-8VT"/>
-                                                        <constraint firstItem="wSU-uZ-awN" firstAttribute="top" secondItem="ovL-S6-x5C" secondAttribute="top" id="pOG-1i-NJy"/>
-                                                        <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Koj-Zl-GJu" secondAttribute="bottom" constant="2" id="x7O-h5-Iii"/>
-                                                        <constraint firstItem="HGN-mS-EF8" firstAttribute="leading" secondItem="ovL-S6-x5C" secondAttribute="leading" constant="2" id="xg8-of-dSf"/>
-                                                        <constraint firstItem="wSU-uZ-awN" firstAttribute="leading" secondItem="HGN-mS-EF8" secondAttribute="trailing" constant="5" id="zj7-rt-PjG"/>
+                                                        <constraint firstItem="HGN-mS-EF8" firstAttribute="leading" secondItem="ovL-S6-x5C" secondAttribute="leading" constant="8" id="2Vx-fP-Vpg"/>
+                                                        <constraint firstAttribute="trailing" secondItem="Koj-Zl-GJu" secondAttribute="trailing" constant="4" id="4b3-Bn-br8"/>
+                                                        <constraint firstItem="Koj-Zl-GJu" firstAttribute="top" secondItem="HGN-mS-EF8" secondAttribute="bottom" id="BEl-MF-g0t"/>
+                                                        <constraint firstItem="HGN-mS-EF8" firstAttribute="top" secondItem="ovL-S6-x5C" secondAttribute="top" constant="10" id="NHu-bk-cjg"/>
+                                                        <constraint firstItem="wSU-uZ-awN" firstAttribute="baseline" secondItem="HGN-mS-EF8" secondAttribute="baseline" id="cpw-mq-VVd"/>
+                                                        <constraint firstItem="HGN-mS-EF8" firstAttribute="leading" secondItem="Koj-Zl-GJu" secondAttribute="leading" id="jgj-qi-Iso"/>
+                                                        <constraint firstAttribute="trailing" secondItem="wSU-uZ-awN" secondAttribute="trailing" constant="4" id="kUJ-oO-cwe"/>
+                                                        <constraint firstAttribute="bottom" secondItem="Koj-Zl-GJu" secondAttribute="bottom" constant="11" id="lQg-Nj-lbF"/>
+                                                        <constraint firstItem="wSU-uZ-awN" firstAttribute="leading" secondItem="HGN-mS-EF8" secondAttribute="trailing" constant="8" symbolic="YES" id="zj7-rt-PjG"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="hintTextField" destination="wSU-uZ-awN" id="pfT-b7-gcS"/>
@@ -120,7 +117,7 @@
                                     </connections>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <nil key="backgroundColor"/>
                         </clipView>
                         <constraints>
                             <constraint firstAttribute="height" constant="100" id="IQh-Jt-QWa"/>
@@ -134,17 +131,35 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Sj8-VF-nKp">
+                        <rect key="frame" x="3" y="103" width="474" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="32" id="JiE-38-uuY"/>
+                        </constraints>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" placeholderString="Action" drawsBackground="YES" usesSingleLineMode="YES" id="T1U-mO-CqH">
+                            <font key="font" metaFont="system" size="20"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="0nc-H3-qNB" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="10" id="1Wk-PF-dkF"/>
-                    <constraint firstAttribute="trailing" secondItem="0nc-H3-qNB" secondAttribute="trailing" constant="10" id="7Ia-T9-HM4"/>
-                    <constraint firstAttribute="bottom" secondItem="1CY-u2-UVN" secondAttribute="bottom" constant="10" id="7KD-xR-JKN"/>
-                    <constraint firstItem="0nc-H3-qNB" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="10" id="89u-Ui-8xY"/>
-                    <constraint firstItem="1CY-u2-UVN" firstAttribute="top" secondItem="0nc-H3-qNB" secondAttribute="bottom" constant="2" id="iyB-ac-dDB"/>
-                    <constraint firstItem="1CY-u2-UVN" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="10" id="nhg-FA-IcY"/>
-                    <constraint firstAttribute="trailing" secondItem="1CY-u2-UVN" secondAttribute="trailing" constant="10" id="tMS-I9-8Ls"/>
+                    <constraint firstAttribute="bottom" secondItem="1CY-u2-UVN" secondAttribute="bottom" id="7KD-xR-JKN"/>
+                    <constraint firstItem="Sj8-VF-nKp" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="3" id="IRa-Jk-Y00"/>
+                    <constraint firstItem="Sj8-VF-nKp" firstAttribute="centerY" secondItem="nc0-Yx-xE7" secondAttribute="centerY" id="Kdt-Yf-UA0"/>
+                    <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Sj8-VF-nKp" secondAttribute="bottom" constant="3" id="LKt-zH-pkt"/>
+                    <constraint firstItem="Sj8-VF-nKp" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="3" id="Tf5-8i-Igv"/>
+                    <constraint firstItem="1CY-u2-UVN" firstAttribute="top" secondItem="Sj8-VF-nKp" secondAttribute="bottom" constant="3" id="khp-r6-4QH"/>
+                    <constraint firstAttribute="trailing" secondItem="Sj8-VF-nKp" secondAttribute="trailing" constant="3" id="l4p-37-Gkr"/>
+                    <constraint firstItem="1CY-u2-UVN" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="nhg-FA-IcY"/>
+                    <constraint firstItem="nc0-Yx-xE7" firstAttribute="trailing" secondItem="Sj8-VF-nKp" secondAttribute="trailing" constant="-8" id="skL-w3-x1V"/>
+                    <constraint firstAttribute="trailing" secondItem="1CY-u2-UVN" secondAttribute="trailing" id="tMS-I9-8Ls"/>
                 </constraints>
             </view>
+            <point key="canvasLocation" x="498" y="293"/>
         </window>
     </objects>
+    <resources>
+        <image name="NSStopProgressFreestandingTemplate" width="14" height="14"/>
+    </resources>
 </document>
diff --git a/PGXcodeActionBrowser/Model/XCCodeSnippetProvider.m b/PGXcodeActionBrowser/Model/XCCodeSnippetProvider.m
index fdbd125..b5d37c3 100644
--- a/PGXcodeActionBrowser/Model/XCCodeSnippetProvider.m
+++ b/PGXcodeActionBrowser/Model/XCCodeSnippetProvider.m
@@ -107,7 +107,14 @@ - (void)buildAvailableActions
         
         XCExpandCodeSnippetAction *action = [[XCExpandCodeSnippetAction alloc] initWithCodeSnippet:snippet];
         action.group = [self actionGroupName];
-        
+        action.enabled = YES;
+        action.group   = [self actionGroupName];
+        action.representedObject = snippet;
+
+        NSBundle *IDEKItBundle = [NSBundle bundleWithIdentifier:@"com.apple.dt.IDEKit"];
+        NSImage *snippetIcon = [IDEKItBundle imageForResource:@"CS_System"];
+        action.icon = snippetIcon;
+
         [actions addObject:action];
         
         ////////////////////////////////////////////////////////////////////////////////
diff --git a/PGXcodeActionBrowser/UI/XCRoundCornerWindow.m b/PGXcodeActionBrowser/UI/XCRoundCornerWindow.m
index a6828f9..c6bc6f1 100644
--- a/PGXcodeActionBrowser/UI/XCRoundCornerWindow.m
+++ b/PGXcodeActionBrowser/UI/XCRoundCornerWindow.m
@@ -36,11 +36,11 @@ - (BOOL)canBecomeKeyWindow
 ////////////////////////////////////////////////////////////////////////////////
 - (void)setContentView:(NSView *)contentView
 {
-    contentView.wantsLayer          = YES;
-    contentView.layer.frame         = contentView.frame;
-    contentView.layer.cornerRadius  = 10.0;
+    contentView.wantsLayer = YES;
+    contentView.layer.frame = contentView.frame;
+    contentView.layer.cornerRadius = 3.0;
     contentView.layer.masksToBounds = YES;
-    
+
     [super setContentView:contentView];
 }
 
diff --git a/PGXcodeActionBrowser/UI/XCSearchResultCell.h b/PGXcodeActionBrowser/UI/XCSearchResultCell.h
index 7c5db65..4e7b15d 100644
--- a/PGXcodeActionBrowser/UI/XCSearchResultCell.h
+++ b/PGXcodeActionBrowser/UI/XCSearchResultCell.h
@@ -14,5 +14,6 @@
 
 @property (strong) IBOutlet NSTextField *hintTextField;
 @property (strong) IBOutlet NSTextField *subtitleTextField;
+@property (strong) IBOutlet NSImageView *iconImageView;
 
 @end
diff --git a/PGXcodeActionBrowser/UI/XCSearchResultCell.xib b/PGXcodeActionBrowser/UI/XCSearchResultCell.xib
deleted file mode 100644
index 4ae2ba0..0000000
--- a/PGXcodeActionBrowser/UI/XCSearchResultCell.xib
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner"/>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <tableCellView id="C3E-VB-Yq5" customClass="XCSearchResultCell">
-            <rect key="frame" x="0.0" y="0.0" width="190" height="38"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="4S9-ut-ixD" userLabel="Text">
-                    <rect key="frame" x="-2" y="21" width="163" height="17"/>
-                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Text" id="4kG-Jv-aib">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="dLw-9h-L4s" userLabel="Hint">
-                    <rect key="frame" x="162" y="21" width="30" height="17"/>
-                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Hint" id="72Z-Ak-S31">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="SgY-a6-1T4" userLabel="Subtitle">
-                    <rect key="frame" x="0.0" y="2" width="192" height="17"/>
-                    <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" title="Subtitle" id="Q6h-OS-D6s">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    </textFieldCell>
-                </textField>
-            </subviews>
-            <constraints>
-                <constraint firstAttribute="trailing" secondItem="dLw-9h-L4s" secondAttribute="trailing" id="6d3-Kj-hnM"/>
-                <constraint firstAttribute="trailing" secondItem="SgY-a6-1T4" secondAttribute="trailing" id="Pks-lp-VEH"/>
-                <constraint firstItem="4S9-ut-ixD" firstAttribute="top" secondItem="C3E-VB-Yq5" secondAttribute="top" id="SpH-Jn-x9q"/>
-                <constraint firstAttribute="bottom" secondItem="SgY-a6-1T4" secondAttribute="bottom" constant="2" id="XEV-5u-yA8"/>
-                <constraint firstItem="SgY-a6-1T4" firstAttribute="top" secondItem="4S9-ut-ixD" secondAttribute="bottom" constant="2" id="enR-pi-0Pa"/>
-                <constraint firstItem="dLw-9h-L4s" firstAttribute="top" secondItem="C3E-VB-Yq5" secondAttribute="top" id="f9I-kv-fro"/>
-                <constraint firstItem="dLw-9h-L4s" firstAttribute="leading" secondItem="4S9-ut-ixD" secondAttribute="trailing" constant="5" id="mFg-tu-cqZ"/>
-                <constraint firstItem="4S9-ut-ixD" firstAttribute="leading" secondItem="C3E-VB-Yq5" secondAttribute="leading" id="o4N-Vx-sVd"/>
-                <constraint firstItem="SgY-a6-1T4" firstAttribute="leading" secondItem="C3E-VB-Yq5" secondAttribute="leading" constant="2" id="t1b-G7-4Vo"/>
-            </constraints>
-            <connections>
-                <outlet property="hintTextField" destination="dLw-9h-L4s" id="Suo-eS-jRH"/>
-                <outlet property="subtitleTextField" destination="SgY-a6-1T4" id="A3y-te-b7a"/>
-                <outlet property="textField" destination="4S9-ut-ixD" id="dYc-r7-1Xw"/>
-            </connections>
-            <point key="canvasLocation" x="618" y="496.5"/>
-        </tableCellView>
-    </objects>
-</document>
diff --git a/XCActionBar.xcodeproj/project.pbxproj b/XCActionBar.xcodeproj/project.pbxproj
index 9b0bf11..3cf19a1 100644
--- a/XCActionBar.xcodeproj/project.pbxproj
+++ b/XCActionBar.xcodeproj/project.pbxproj
@@ -27,7 +27,6 @@
 		421D37081AB790D900FF8338 /* XCSurroundWithActions.plist in Resources */ = {isa = PBXBuildFile; fileRef = 421D37071AB790D900FF8338 /* XCSurroundWithActions.plist */; };
 		421D370B1AB7982300FF8338 /* XCAddPrefixToLinesAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 421D370A1AB7982300FF8338 /* XCAddPrefixToLinesAction.m */; };
 		421D370E1AB7982F00FF8338 /* XCAddSuffixToLinesAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 421D370D1AB7982F00FF8338 /* XCAddSuffixToLinesAction.m */; };
-		4228E3E81AB1B7D100918EAA /* XCSearchResultCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4228E3E71AB1B7D100918EAA /* XCSearchResultCell.xib */; };
 		4228E3EB1AB1B82A00918EAA /* XCSearchResultCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4228E3EA1AB1B82A00918EAA /* XCSearchResultCell.m */; };
 		422DB1BF1AB60134007D13F9 /* XCCodeSnippetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 422DB1BE1AB60134007D13F9 /* XCCodeSnippetProvider.m */; };
 		423986FB1AC0DEB300559D29 /* XCTextSelectionStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 423986FA1AC0DEB300559D29 /* XCTextSelectionStorage.m */; };
@@ -108,7 +107,6 @@
 		421E215B1AB321DC000893ED /* _IDETestableState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _IDETestableState.h; sourceTree = "<group>"; };
 		421F53561AB9CFF600509103 /* XCSearchStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCSearchStrategy.h; sourceTree = "<group>"; };
 		422781921AB05883003CDD79 /* XCActionBar-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "XCActionBar-Prefix.pch"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		4228E3E71AB1B7D100918EAA /* XCSearchResultCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = XCSearchResultCell.xib; sourceTree = "<group>"; };
 		4228E3E91AB1B82A00918EAA /* XCSearchResultCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = XCSearchResultCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		4228E3EA1AB1B82A00918EAA /* XCSearchResultCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = XCSearchResultCell.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		422DB1BA1AB5FAF5007D13F9 /* IDECodeSnippet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDECodeSnippet.h; sourceTree = "<group>"; };
@@ -563,7 +561,6 @@
 			children = (
 				42FD3C0D1AB0ABE900F0A442 /* XCRoundCornerWindow.h */,
 				42FD3C0E1AB0ABE900F0A442 /* XCRoundCornerWindow.m */,
-				4228E3E71AB1B7D100918EAA /* XCSearchResultCell.xib */,
 				4228E3E91AB1B82A00918EAA /* XCSearchResultCell.h */,
 				4228E3EA1AB1B82A00918EAA /* XCSearchResultCell.m */,
 			);
@@ -659,7 +656,6 @@
 				421D37081AB790D900FF8338 /* XCSurroundWithActions.plist in Resources */,
 				4214C9A01ACDC33A009FA602 /* fontawesome-webfont.ttf in Resources */,
 				426782EB1ABA37E8006F4E53 /* XCActionBarConfiguration.plist in Resources */,
-				4228E3E81AB1B7D100918EAA /* XCSearchResultCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};