diff --git a/src/frontend/templates/service.html b/src/frontend/templates/service.html
index 22babb7..b2f1da6 100644
--- a/src/frontend/templates/service.html
+++ b/src/frontend/templates/service.html
@@ -140,15 +140,26 @@
 </section>
 
 <!-- ToS Checker -->
+{{if gt (len .Service.TosHighlights) -10}}
 <section class="flex flex-col items-center justify-center p-4 pb-4 mt-2 border-t-2 border-opacity-50 border-dashed border-t-lime-400/10" id="tos">
     
     <a href="/about#tos-checker" class="text-xl font-bold">
-        Automated ToS Checker
-        <svg xmlns="http://www.w3.org/2000/svg" class="inline-block w-4 h-4 question-mark" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+        <svg xmlns="http://www.w3.org/2000/svg" class="inline-block w-4 h-4 calendar-cog" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
             <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-            <path d="M8 8a3.5 3 0 0 1 3.5 -3h1a3.5 3 0 0 1 3.5 3a3 3 0 0 1 -2 3a3 4 0 0 0 -2 4"></path>
-            <path d="M12 19l0 .01"></path>
-        </svg>
+            <path d="M12 21h-6a2 2 0 0 1 -2 -2v-12a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v5"></path>
+            <path d="M16 3v4"></path>
+            <path d="M8 3v4"></path>
+            <path d="M4 11h16"></path>
+            <path d="M19.001 19m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"></path>
+            <path d="M19.001 15.5v1.5"></path>
+            <path d="M19.001 21v1.5"></path>
+            <path d="M22.032 17.25l-1.299 .75"></path>
+            <path d="M17.27 20l-1.3 .75"></path>
+            <path d="M15.97 17.25l1.3 .75"></path>
+            <path d="M20.733 20l1.3 .75"></path>
+         </svg>
+        <span>Automated ToS Checker</span>
+        <span class="text-xs text-white/30">?</span>
     </a>
     {{if .Service.TosHighlights}}
         <p class="max-w-sm text-xs text-center text-gray-300 text-opacity-75">Automated, ai-driven weekly ToS checks.</p>
@@ -165,16 +176,18 @@
         <p class="max-w-md mt-2 font-bold text-center text-opacity-75 text-amber-400 text-md">This service does not have any ToS checks.</p>
     {{end}}
 </section>
+{{end}}
 
 <!-- Comments -->
-<section class="flex flex-col items-center justify-center px-8 pt-4 pb-8" id="discuss">
+<section class="flex flex-col items-center justify-center p-4 pb-4 mt-2 border-t-2 border-opacity-50 border-dashed border-t-lime-400/10" id="discuss">
         <a href="https://usenostr.org" target="_blank" class="text-xl font-bold">
-            Nostr Comments
-            <svg xmlns="http://www.w3.org/2000/svg" class="inline-block w-4 h-4 question-mark" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+            <svg xmlns="http://www.w3.org/2000/svg" class="inline-block w-4 h-4 messages" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                 <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                <path d="M8 8a3.5 3 0 0 1 3.5 -3h1a3.5 3 0 0 1 3.5 3a3 3 0 0 1 -2 3a3 4 0 0 0 -2 4"></path>
-                <path d="M12 19l0 .01"></path>
+                <path d="M21 14l-3 -3h-7a1 1 0 0 1 -1 -1v-6a1 1 0 0 1 1 -1h9a1 1 0 0 1 1 1v10"></path>
+                <path d="M14 15v2a1 1 0 0 1 -1 1h-7l-3 3v-10a1 1 0 0 1 1 -1h2"></path>
             </svg>
+            <span>Nostr Comments</span>
+            <span class="text-xs text-white/30">?</span>
         </a>
         <h2 class="text-xl font-bold"></h2>
         <p class="max-w-sm pb-4 mt-1 text-xs text-center text-gray-300 text-opacity-75">