diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php
index f147ec65..60db7d8c 100644
--- a/resources/views/templates/note.blade.php
+++ b/resources/views/templates/note.blade.php
@@ -16,8 +16,8 @@
     </div>
     <div class="note-metadata">
       <a class="u-url" href="/notes/{{ $note->nb60id }}"><time class="dt-published" datetime="{{ $note->iso8601_time }}">{{ $note->human_time }}</time></a>@if($note->client_name) via <a class="client" href="{{ $note->client_id }}">{{ $note->client_name }}</a>@endif
-      @if($note->placeLink)in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->placeLink }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->latitude }}"><data class="p-longitude" value="{{ $note->latitude }}"></span>
-      @elseif($note->address)in <span class="p-location h-adr">{!! $note->address !!}<data class="p-latitude" value="{{ $note->latitude }}"><data class="p-longitude" value="{{ $note->longitude }}"></span>@endif
+      @if($note->placeLink)in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->placeLink }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->latitude }}"></data><data class="p-longitude" value="{{ $note->latitude }}"></data></span>
+      @elseif($note->address)in <span class="p-location h-adr">{!! $note->address !!}<data class="p-latitude" value="{{ $note->latitude }}"></data><data class="p-longitude" value="{{ $note->longitude }}"></data></span>@endif
       @if($note->replies > 0)Replies: {{ $note->replies }}@endif
       @if($note->tweet_id)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'nb60id' => $note->nb60id])@endif
 @if ($note->placeLink)
diff --git a/resources/views/templates/social-links.blade.php b/resources/views/templates/social-links.blade.php
index b7852ca1..afc87d4f 100644
--- a/resources/views/templates/social-links.blade.php
+++ b/resources/views/templates/social-links.blade.php
@@ -6,26 +6,20 @@
             </g>
         </svg>
     </a> -
-    <indie-action do="reply" with="/notes/{{ $nb60id }}">
-        <a href="https://twitter.com/intent/tweet?in_reply_to={{ $tweet_id }}">
-            <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 920.898 1000" class="icon">
-                <path d="M0 470.52q0 -6.832 3.416 -13.664t6.344 -9.76l3.416 -3.416 376.736 -273.768q20.496 -15.616 35.38 -5.368t14.884 40.016v111.264l26.84 1.952q96.136 8.296 181.292 54.168t145.424 117.12 94.428 165.432 32.696 196.176q-60.512 -106.872 -161.284 -174.704t-222.284 -78.08q-49.288 -4.392 -97.112 1.464v137.128q0 29.768 -14.884 40.016t-35.38 -5.368l-376.736 -274.256q-13.176 -11.224 -13.176 -26.352z"/>
-            </svg>
-        </a>
-    </indie-action>
-    <indie-action do="repost" with="/notes/{{ $nb60id }}">
-        <a href="https://twitter.com/intent/retweet?tweet_id={{ $tweet_id }}">
-            <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1071.429 1000" class="icon">
-                <path d="M714.24 839.296q0 7.254 -5.301 12.555t-12.555 5.301h-535.68q-4.464 0 -7.533 -1.116t-5.022 -3.906 -3.069 -4.464 -1.674 -6.417 -.558 -6.417v-334.79999999999995h-107.136q-14.508 0 -25.11 -10.602t-10.602 -25.11q0 -13.392 8.37 -22.878l178.56 -214.272q10.602 -12.276 27.342 -12.276t27.342 12.276l178.56 214.272q8.37 9.486 8.37 22.878 0 14.508 -10.602 25.11t-25.11 10.602h-107.136v214.272h321.408q8.928 0 13.95 6.138l89.28 107.136q3.906 6.138 3.906 11.718zm357.12 -232.128q0 13.392 -8.37 22.878l-178.56 214.272q-11.16 12.834 -27.342 12.834t-27.342 -12.834l-178.56 -214.272q-8.37 -9.486 -8.37 -22.878 0 -14.508 10.602 -25.11t25.11 -10.602h107.136v-214.272h-321.408q-8.928 0 -13.95 -6.696l-89.28 -107.136q-3.906 -5.022 -3.906 -11.16 0 -7.254 5.301 -12.555t12.555 -5.301h535.68q4.464 0 7.533 1.116t5.022 3.906 3.069 4.464 1.674 6.417 .558 6.417v334.79999999999995h107.136q14.508 0 25.11 10.602t10.602 25.11z"/>
-            </svg>
-        </a>
-    </indie-action>
-    <indie-action do="like" with="/notes/{{ $nb60id }}">
-        <a href="https://twitter.com/intent/favorite?tweet_id={{ $tweet_id }}">
-            <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 645 585" class="icon">
-                <path d="M 297.29747,550.86823 C 283.52243,535.43191 249.1268,505.33855 220.86277,483.99412 C 137.11867,420.75228 125.72108,411.5999 91.719238,380.29088 C 29.03471,322.57071 2.413622,264.58086 2.5048478,185.95124 C 2.5493594,147.56739 5.1656152,132.77929 15.914734,110.15398 C 34.151433,71.768267 61.014996,43.244667 95.360052,25.799457 C 119.68545,13.443675 131.6827,7.9542046 172.30448,7.7296236 C 214.79777,7.4947896 223.74311,12.449347 248.73919,26.181459 C 279.1637,42.895777 310.47909,78.617167 316.95242,103.99205 L 320.95052,119.66445 L 330.81015,98.079942 C 386.52632,-23.892986 564.40851,-22.06811 626.31244,101.11153 C 645.95011,140.18758 648.10608,223.6247 630.69256,270.6244 C 607.97729,331.93377 565.31255,378.67493 466.68622,450.30098 C 402.0054,497.27462 328.80148,568.34684 323.70555,578.32901 C 317.79007,589.91654 323.42339,580.14491 297.29747,550.86823 z"/>
-                <g transform="translate(129.28571,-64.285714)"/>
-            </svg>
-        </a>
-    </indie-action>
+    <a href="https://twitter.com/intent/tweet?in_reply_to={{ $tweet_id }}">
+        <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 920.898 1000" class="icon">
+            <path d="M0 470.52q0 -6.832 3.416 -13.664t6.344 -9.76l3.416 -3.416 376.736 -273.768q20.496 -15.616 35.38 -5.368t14.884 40.016v111.264l26.84 1.952q96.136 8.296 181.292 54.168t145.424 117.12 94.428 165.432 32.696 196.176q-60.512 -106.872 -161.284 -174.704t-222.284 -78.08q-49.288 -4.392 -97.112 1.464v137.128q0 29.768 -14.884 40.016t-35.38 -5.368l-376.736 -274.256q-13.176 -11.224 -13.176 -26.352z"/>
+        </svg>
+    </a>
+    <a href="https://twitter.com/intent/retweet?tweet_id={{ $tweet_id }}">
+        <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1071.429 1000" class="icon">
+            <path d="M714.24 839.296q0 7.254 -5.301 12.555t-12.555 5.301h-535.68q-4.464 0 -7.533 -1.116t-5.022 -3.906 -3.069 -4.464 -1.674 -6.417 -.558 -6.417v-334.79999999999995h-107.136q-14.508 0 -25.11 -10.602t-10.602 -25.11q0 -13.392 8.37 -22.878l178.56 -214.272q10.602 -12.276 27.342 -12.276t27.342 12.276l178.56 214.272q8.37 9.486 8.37 22.878 0 14.508 -10.602 25.11t-25.11 10.602h-107.136v214.272h321.408q8.928 0 13.95 6.138l89.28 107.136q3.906 6.138 3.906 11.718zm357.12 -232.128q0 13.392 -8.37 22.878l-178.56 214.272q-11.16 12.834 -27.342 12.834t-27.342 -12.834l-178.56 -214.272q-8.37 -9.486 -8.37 -22.878 0 -14.508 10.602 -25.11t25.11 -10.602h107.136v-214.272h-321.408q-8.928 0 -13.95 -6.696l-89.28 -107.136q-3.906 -5.022 -3.906 -11.16 0 -7.254 5.301 -12.555t12.555 -5.301h535.68q4.464 0 7.533 1.116t5.022 3.906 3.069 4.464 1.674 6.417 .558 6.417v334.79999999999995h107.136q14.508 0 25.11 10.602t10.602 25.11z"/>
+        </svg>
+    </a>
+    <a href="https://twitter.com/intent/favorite?tweet_id={{ $tweet_id }}">
+        <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 645 585" class="icon">
+            <path d="M 297.29747,550.86823 C 283.52243,535.43191 249.1268,505.33855 220.86277,483.99412 C 137.11867,420.75228 125.72108,411.5999 91.719238,380.29088 C 29.03471,322.57071 2.413622,264.58086 2.5048478,185.95124 C 2.5493594,147.56739 5.1656152,132.77929 15.914734,110.15398 C 34.151433,71.768267 61.014996,43.244667 95.360052,25.799457 C 119.68545,13.443675 131.6827,7.9542046 172.30448,7.7296236 C 214.79777,7.4947896 223.74311,12.449347 248.73919,26.181459 C 279.1637,42.895777 310.47909,78.617167 316.95242,103.99205 L 320.95052,119.66445 L 330.81015,98.079942 C 386.52632,-23.892986 564.40851,-22.06811 626.31244,101.11153 C 645.95011,140.18758 648.10608,223.6247 630.69256,270.6244 C 607.97729,331.93377 565.31255,378.67493 466.68622,450.30098 C 402.0054,497.27462 328.80148,568.34684 323.70555,578.32901 C 317.79007,589.91654 323.42339,580.14491 297.29747,550.86823 z"/>
+            <g transform="translate(129.28571,-64.285714)"/>
+        </svg>
+    </a>
 </span>