diff --git a/code/search.js b/code/search.js
index 77645994..1f9f4438 100644
--- a/code/search.js
+++ b/code/search.js
@@ -18,6 +18,7 @@ addHook('search', function(query) {});
 - `bounds`: a L.LatLngBounds object describing the bounds of this result
 - `layer`: a ILayer to be added to the map when the user selects this search result. Will be generated if not set.
   Set to `null` to prevent the result from being added to the map.
+- `icon`: a URL to a icon to display in the result list. Should be 12x12.
 - `onSelected(result, event)`: a handler to be called when the result is selected. May return `true` to prevent the map
   from being repositioned. You may reposition the map yourself or do other work.
 - `onRemove(result)`: a handler to be called when the result is removed from the map (because another result has been
@@ -93,10 +94,15 @@ window.search.Query.prototype.addResult = function(result) {
       }
     });
 
-  $('<a>')
+  var link = $('<a>')
     .text(result.title)
     .appendTo(item);
 
+  if(result.icon) {
+    link.css('background-image', 'url("'+result.icon+'")');
+    item.css('list-style', 'none');
+  }
+
   if(result.description) {
     item
       .append($('<br>'))
@@ -221,9 +227,12 @@ addHook('search', function(query) {
   var term = query.term.toLowerCase();
   $.each(portals, function(guid, portal) {
     if(portal.options.data.title.toLowerCase().indexOf(term) !== -1) {
+      var team = portal.options.team;
+      var color = team==TEAM_NONE ? '#CCC' : COLORS[team];
       query.addResult({
         title: portal.options.data.title,
         position: portal.getLatLng(),
+        icon: 'data:image/svg+xml;base64,'+btoa('@@INCLUDESTRING:images/icon-portal.svg@@'.replace(/%COLOR%/g, color)),
       });
     }
   });
diff --git a/images/icon-portal.svg b/images/icon-portal.svg
new file mode 100644
index 00000000..b9918282
--- /dev/null
+++ b/images/icon-portal.svg
@@ -0,0 +1,7 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="12" height="12" version="1.1">
+	<g style="fill:%COLOR%;stroke:none">
+		<path d="m 6,12 -2,-12  4,0 z" />
+		<path d="m 6,12 -4, -8  8,0 z" />
+		<path d="m 6,12 -6, -4 12,0 z" />
+	</g>
+</svg>
diff --git a/style.css b/style.css
index 25aa33ee..6e6d1091 100644
--- a/style.css
+++ b/style.css
@@ -540,6 +540,12 @@ input[type="search"], input[type="url"] {
 #searchwrapper li {
   cursor: pointer;
 }
+#searchwrapper li a {
+  margin-left: -14px;
+  padding-left: 14px;
+  background-position: 1px center;
+  background-repeat: no-repeat;
+}
 #searchwrapper li em {
   color: #ccc;
   font-size: 0.9em;