diff --git a/css/app.css b/css/app.css
index 13df2863f..bcba11599 100644
--- a/css/app.css
+++ b/css/app.css
@@ -487,7 +487,6 @@ button.save.has-count .count::before {
 .icon.back       { background-position: -420px 0;}
 .icon.forward    { background-position: -440px 0;}
 .icon.help       { background-position: -460px 0;}
-.icon.out-link   { background-position: -480px 0;}
 
 .icon.inspect.light    { background-position: -220px -20px;}
 .icon.geocode.light    { background-position: -280px -20px;}
@@ -540,6 +539,11 @@ button[disabled] .icon.nearby     { background-position: -340px -40px;}
 .icon-operation-disabled-rotate        { background-position: -180px -160px;}
 .icon-operation-disabled-simplify      { background-position: -200px -160px;}
 
+/* Out link is special */
+
+.icon.out-link   { height: 14px; width: 14px; background-position: -500px 0;}
+a:hover .icon.out-link   { background-position: -500px -14px;}
+
 /* Universal preset icons */
 
 .icon.source     { background-position:   0 -200px;}
@@ -1370,6 +1374,11 @@ div.combobox {
     overflow: hidden;
 }
 
+.tag-help a {
+    margin-top: 5px;
+    display: block;
+}
+
 .grid-pane .tag-reference-wrap {
     padding: 10px 0 20px 0;
 }
diff --git a/data/core.yaml b/data/core.yaml
index d5fdb8ea8..dd7215070 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -154,12 +154,12 @@ en:
     no_documentation_key: There is no documentation available for this key
     show_more: Show More
     new_tag: New tag
-    view_on_osm: View on OSM →
+    view_on_osm: View on openstreetmap.org
     editing_feature: "Editing {feature}"
     additional: Additional tags
     choose: Select feature type
     results: "{n} results for {search}"
-    reference: View on OpenStreetMap Wiki →
+    reference: View on OpenStreetMap Wiki
     back_tooltip: Change feature type
   background:
     title: Background
diff --git a/data/locales.js b/data/locales.js
index cb299b379..7bd71aa90 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -192,12 +192,12 @@ locale.en = {
         "no_documentation_key": "There is no documentation available for this key",
         "show_more": "Show More",
         "new_tag": "New tag",
-        "view_on_osm": "View on OSM →",
+        "view_on_osm": "View on openstreetmap.org",
         "editing_feature": "Editing {feature}",
         "additional": "Additional tags",
         "choose": "Select feature type",
         "results": "{n} results for {search}",
-        "reference": "View on OpenStreetMap Wiki →",
+        "reference": "View on OpenStreetMap Wiki",
         "back_tooltip": "Change feature type"
     },
     "background": {
diff --git a/img/sprite.png b/img/sprite.png
index c60de32dc..950e5f89d 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/img/sprite2x.png b/img/sprite2x.png
index e08cb78e0..dfb1a1853 100644
Binary files a/img/sprite2x.png and b/img/sprite2x.png differ
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index a49f19acb..82f01f561 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -73,12 +73,16 @@ iD.ui.TagEditor = function(context, entity) {
             .call(tagList, preset.id === 'other');
 
         if (!entity.isNew()) {
-            tageditorpreset.append('div')
+            osmLink = tageditorpreset.append('div')
                 .attr('class', 'col12 inspector-inner')
                 .append('a')
                 .attr('href', 'http://www.openstreetmap.org/browse/' + entity.type + '/' + entity.osmId())
-                .attr('target', '_blank')
-                .text(t('inspector.view_on_osm'));
+                .attr('target', '_blank');
+
+            osmLink.append('span')
+                .attr('class','icon icon-pre-text out-link');
+
+            osmLink.append('span').text(t('inspector.view_on_osm'));
         }
 
         tageditor.tags(tags);
diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js
index b18ba806b..47261451d 100644
--- a/js/id/ui/tag_reference.js
+++ b/js/id/ui/tag_reference.js
@@ -72,10 +72,15 @@ iD.ui.TagReference = function(entity, tag) {
                 .append('p')
                 .text(docs.description);
 
-            referenceBody
+            var wikiLink = referenceBody
                 .append('a')
                 .attr('target', '_blank')
-                .attr('href', 'http://wiki.openstreetmap.org/wiki/' + docs.title)
+                .attr('href', 'http://wiki.openstreetmap.org/wiki/' + docs.title);
+
+            wikiLink.append('span')
+                .attr('class','icon icon-pre-text out-link');
+
+            wikiLink.append('span')
                 .text(t('inspector.reference'));
         });
 
diff --git a/svg/sprite.svg b/svg/sprite.svg
index 5395545c8..f38bfabc0 100644
--- a/svg/sprite.svg
+++ b/svg/sprite.svg
@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="sprite.svg"
-   inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite2x.png"
+   inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -38,22 +38,22 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="494.79901"
-     inkscape:cy="539.80312"
+     inkscape:zoom="16"
+     inkscape:cx="505.57911"
+     inkscape:cy="546.02445"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1483"
      inkscape:window-height="804"
-     inkscape:window-x="287"
-     inkscape:window-y="65"
+     inkscape:window-x="293"
+     inkscape:window-y="0"
      inkscape:window-maximized="0"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     showguides="false"
+     showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="true"
@@ -215,6 +215,10 @@
        orientation="1,0"
        position="500,553"
        id="guide3440" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="520,550"
+       id="guide5526" />
   </sodipodi:namedview>
   <metadata
      id="metadata12398">
@@ -224,7 +228,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -2607,8 +2611,15 @@
     </g>
     <path
        style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 490.5 4 L 490.5 5.5 L 491.5 6.5 L 487 11 L 487 12 L 488 13 L 489 13 L 493.5 8.5 L 494.5 9.5 L 496 9.5 L 496 6 L 496 4 L 494 4 L 490.5 4 z M 484 6 L 483 7 L 483 16 L 484 17 L 493 17 L 494 16 L 494 11 L 492 13 L 492 15 L 491 15 L 490 15 L 486 15 L 485 15 L 485 10 L 485 8 L 486 8 L 487 8 L 489 6 L 484 6 z "
-       transform="translate(25,-3.0624999e-6)"
-       id="path3404-8" />
+       d="m 532.5,1.9999969 0,1 1,1 -4.5,4.5000001 0,0.5 0,1 1.5,0 4.5,-4.5000001 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9.0000001 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5.0000001 0,-2 1,0 1,0 2,-2 z"
+       id="path3404-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5520"
+       d="m 532.5,16.999997 0,1 1,1 -4.5,4.5 0,0.5 0,1 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z"
+       style="color:#000000;fill:#597be7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
 </svg>