diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
index 80b4e0df..55af43a1 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm
@@ -31,14 +31,25 @@ ajax '/ajax/content/search/node' => require_login sub {
         my $ports = schema('netdisco')->resultset('DevicePort')
           ->search({mac => $mac->as_IEEE});
 
+        my $wireless = schema('netdisco')->resultset('NodeWireless')->search(
+            { mac => $mac->as_IEEE },
+            { order_by   => { '-desc' => 'time_last' },
+              '+columns' => [
+                {
+                  time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')"
+                }]
+            }
+        );
+
         return unless $sightings->count
             or $ips->count
             or $ports->count;
 
         template 'ajax/search/node_by_mac.tt', {
-          ips => $ips,
+          ips       => $ips,
           sightings => $sightings,
-          ports => $ports,
+          ports     => $ports,
+          wireless  => $wireless,
         }, { layout => undef };
     }
     else {
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index d253d150..6aab58a4 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -224,7 +224,13 @@
             [% ' id: '_ row.remote_id IF row.remote_id %]
             [% ' type: '_ row.remote_type IF row.remote_type %])</a>
           [% ELSIF row.remote_ip AND row.remote_port %]
-          <i class="icon-unlink text-error"></i>&nbsp;
+            [% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %]
+              <i class="icon-phone"></i>&nbsp;
+            [% ELSIF row.remote_type AND row.remote_type.match('(cisco\s+AIR-[L|C]?AP|-K9W8-|^AP:\s)') %]
+              <i class="icon-signal"></i>&nbsp;
+            [% ELSE %]
+              <i class="icon-unlink text-error"></i>&nbsp;
+            [% END %]
           <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
             [% row.remote_ip | html_entity %] (port: [% row.remote_port | html_entity %]
             [% ' id: '_ row.remote_id IF row.remote_id %]
diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt
index 92c4ac28..5f9b9da7 100644
--- a/Netdisco/share/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/share/views/ajax/search/node_by_mac.tt
@@ -1,3 +1,4 @@
+[% USE Number.Format %]
 <table class="table table-bordered table-hover nd_floatinghead">
   <thead>
     <tr>
@@ -117,5 +118,34 @@
     </tr>
     [% SET first_row = 0 %]
     [% END %]
+    [% WHILE (wlan = wireless.next) %]
+    <tr>
+      <td>
+        [% IF first_row %]
+        <a class="nd_linkcell"
+          href="[% search_node %]&q=[% wireless.mac | uri %]">[% wireless.mac | html_entity %]</a>
+        [% ELSE %]
+        &nbsp;
+        [% END %]
+      </td>
+      [% IF params.show_vendor %]
+      <td>
+        &nbsp;
+      </td>
+      [% END %]
+      <td>Wireless Info</td>
+      <td class="nd_center-cell">SSID: [% wlan.ssid | html_entity %]<br>
+          MaxRate: [% wlan.maxrate | html_entity %]Mbps TxRate: [% wlan.txrate | html_entity %]Mbps<br>
+          SigStr: [% wlan.sigstrength | html_entity %] SigQual: [% wlan.sigqual | html_entity %]<br>
+          Rx: [% wlan.rxpkt | format_number %] pkts, [% wlan.rxbyte | format_number %] bytes<br>
+          Tx: [% wlan.txpkt | format_number %] pkts, [% wlan.txbyte | format_number %] bytes<br>
+      </td>
+      [% IF params.stamps %]
+      <td> &nbsp; </td>
+      <td>[% wlan.get_column('time_last_stamp') | html_entity %]</td>
+      [% END %]
+    </tr>
+    [% SET first_row = 0 %]
+    [% END %]
   </tbody>
 </table>