diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go
index cb89ff4..1a8d4a8 100644
--- a/appview/pages/funcmap.go
+++ b/appview/pages/funcmap.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"html"
 	"html/template"
+	"log"
+	"path/filepath"
 	"reflect"
 	"strings"
 
@@ -119,5 +121,39 @@ func funcMap() template.FuncMap {
 		"list": func(args ...any) []any {
 			return args
 		},
+		"i": func(name string, classes ...string) template.HTML {
+			data, err := icon(name, classes)
+			if err != nil {
+				log.Printf("icon %s does not exist", name)
+				data, _ = icon("airplay", classes)
+			}
+			return template.HTML(data)
+		},
 	}
 }
+
+func icon(name string, classes []string) (template.HTML, error) {
+	iconPath := filepath.Join("static", "icons", name)
+
+	if filepath.Ext(name) == "" {
+		iconPath += ".svg"
+	}
+
+	data, err := Files.ReadFile(iconPath)
+	if err != nil {
+		return "", fmt.Errorf("icon %s not found: %w", name, err)
+	}
+
+	// Convert SVG data to string
+	svgStr := string(data)
+
+	svgTagEnd := strings.Index(svgStr, ">")
+	if svgTagEnd == -1 {
+		return "", fmt.Errorf("invalid SVG format for icon %s", name)
+	}
+
+	classTag := ` class="` + strings.Join(classes, " ") + `"`
+
+	modifiedSVG := svgStr[:svgTagEnd] + classTag + svgStr[svgTagEnd:]
+	return template.HTML(modifiedSVG), nil
+}
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index b5542e0..8e2a580 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -25,8 +25,8 @@ import (
 	"github.com/sotangled/tangled/types"
 )
 
-//go:embed templates/* static/*
-var files embed.FS
+//go:embed templates/* static
+var Files embed.FS
 
 type Pages struct {
 	t map[string]*template.Template
@@ -36,7 +36,7 @@ func NewPages() *Pages {
 	templates := make(map[string]*template.Template)
 
 	// Walk through embedded templates directory and parse all .html files
-	err := fs.WalkDir(files, "templates", func(path string, d fs.DirEntry, err error) error {
+	err := fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
@@ -49,7 +49,7 @@ func NewPages() *Pages {
 			if strings.HasPrefix(path, "templates/fragments/") {
 				tmpl, err := template.New(name).
 					Funcs(funcMap()).
-					ParseFS(files, path)
+					ParseFS(Files, path)
 				if err != nil {
 					return fmt.Errorf("setting up fragment: %w", err)
 				}
@@ -64,7 +64,7 @@ func NewPages() *Pages {
 				// Add the page template on top of the base
 				tmpl, err := template.New(name).
 					Funcs(funcMap()).
-					ParseFS(files, "templates/layouts/*.html", "templates/fragments/*.html", path)
+					ParseFS(Files, "templates/layouts/*.html", "templates/fragments/*.html", path)
 				if err != nil {
 					return fmt.Errorf("setting up template: %w", err)
 				}
@@ -577,7 +577,7 @@ func (p *Pages) RepoPullPatchPage(w io.Writer, params RepoPullPatchParams) error
 }
 
 func (p *Pages) Static() http.Handler {
-	sub, err := fs.Sub(files, "static")
+	sub, err := fs.Sub(Files, "static")
 	if err != nil {
 		log.Fatalf("no static dir found? that's crazy: %v", err)
 	}
diff --git a/appview/pages/static/.gitkeep b/appview/pages/static/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/appview/pages/templates/fragments/diff.html b/appview/pages/templates/fragments/diff.html
index 51b5cc1..47257a4 100644
--- a/appview/pages/templates/fragments/diff.html
+++ b/appview/pages/templates/fragments/diff.html
@@ -40,7 +40,7 @@
                 <a {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}>
                   {{ .Name.Old }}
                 </a>
-                <i class="w-4 h-4" data-lucide="arrow-right"></i>
+                {{ i "arrow-right" "w-4 h-4" }}
                 <a {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>
                   {{ .Name.New }}
                 </a>
@@ -53,15 +53,15 @@
 
               {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 rounded" }}
               <div id="right-side-items" class="p-2 flex items-center">
-                <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}"><i class="w-4 h-4" data-lucide="arrow-up-to-line"></i></a>
+                <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a>
                 {{ if gt $idx 0 }}
                   {{ $prev := index $diff (sub $idx 1) }}
-                  <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}"><i class="w-4 h-4" data-lucide="arrow-up"></i></a>
+                  <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a>
                 {{ end }}
 
                 {{ if lt $idx $last }}
                   {{ $next := index $diff (add $idx 1) }}
-                  <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}"><i class="w-4 h-4" data-lucide="arrow-down"></i></a>
+                  <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a>
                 {{ end }}
               </div>
 
diff --git a/appview/pages/templates/fragments/editRepoDescription.html b/appview/pages/templates/fragments/editRepoDescription.html
index 9e00468..20e3465 100644
--- a/appview/pages/templates/fragments/editRepoDescription.html
+++ b/appview/pages/templates/fragments/editRepoDescription.html
@@ -1,11 +1,11 @@
 {{ define "fragments/editRepoDescription" }}
-<form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML">
-    <input type="text" name="description" value="{{ .RepoInfo.Description }}">
-    <button type="submit" class="bg-green-100 text-green-700 rounded p-1 mr-1 hover:bg-green-200 font-mono uppercase text-sm">
-      save
+<form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2">
+    <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}">
+    <button type="submit" class="btn p-2 flex items-center gap-2 no-underline text-sm">
+      save {{ i "check" "w-3 h-3" }}
     </button>
-    <button type="button" class="bg-red-100 text-red-700 rounded p-1 hover:bg-red-200  font-mono uppercase text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" >
-      cancel
+    <button type="button" class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" >
+      cancel {{ i "x" "w-3 h-3" }}
     </button>
 </form>
 {{ end }}
diff --git a/appview/pages/templates/fragments/repoDescription.html b/appview/pages/templates/fragments/repoDescription.html
index 3b7ee06..0ae3acd 100644
--- a/appview/pages/templates/fragments/repoDescription.html
+++ b/appview/pages/templates/fragments/repoDescription.html
@@ -1,5 +1,5 @@
 {{ define "fragments/repoDescription" }}
-<span id="repo-description" hx-target="this" hx-swap="outerHTML">
+<span id="repo-description" class="flex flex-wrap items-center gap-2" hx-target="this" hx-swap="outerHTML">
     {{ if .RepoInfo.Description }}
         {{ .RepoInfo.Description }}
     {{ else }}
@@ -7,8 +7,9 @@
     {{ end }}
 
     {{ if .RepoInfo.Roles.IsOwner }}
-    <button class="bg-gray-200 uppercase rounded p-1 ml-1 hover:bg-gray-400 font-mono text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit">
+    <button class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit">
       edit
+      {{ i "pencil" "w-3 h-3" }}
     </button>
     {{ end }}
 </span>
diff --git a/appview/pages/templates/fragments/star.html b/appview/pages/templates/fragments/star.html
index 4af3545..c2635e2 100644
--- a/appview/pages/templates/fragments/star.html
+++ b/appview/pages/templates/fragments/star.html
@@ -15,19 +15,14 @@
     >
     <div class="flex gap-2 items-center">
       {{ if .IsStarred }}
-      <span class="w-3 h-3 fill-current" data-lucide="star"></span>
+      {{ i "star" "w-3 h-3 fill-current" }}
       {{ else }}
-      <span class="w-3 h-3" data-lucide="star"></span>
+      {{ i "star" "w-3 h-3" }}
       {{ end }}
       <span>
         {{ .Stats.StarCount }}
       </span>
     </div>
   </button>
-  <script>
-    document.body.addEventListener('htmx:afterRequest', function (evt) {
-      lucide.createIcons();
-    });
-  </script>
 {{ end }}
 
diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 4b0c93b..b9c3bdf 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -24,10 +24,6 @@
                     {{ template "layouts/footer" . }}
                 {{ end }}
             </footer>
-            <script src="/static/lucide.min.js"></script>
-            <script>
-              lucide.createIcons();
-            </script>
           </div>
         </body>
     </html>
diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html
index 20eadf3..3d30a73 100644
--- a/appview/pages/templates/layouts/topbar.html
+++ b/appview/pages/templates/layouts/topbar.html
@@ -9,7 +9,7 @@
             <div id="right-items" class="flex gap-2">
                 {{ with .LoggedInUser }}
                     <a href="/repo/new" hx-boost="true">
-                        <i class="w-6 h-6" data-lucide="plus"></i>
+                      {{ i "plus" "w-6 h-6" }}
                     </a>
                     {{ block "dropDown" . }} {{ end }}
                 {{ else }}
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index ffde4a0..ae9188b 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -37,7 +37,7 @@
       <p class="flex items-center text-sm text-gray-500">
           <a href="/{{ $repo }}/commit/{{ $commit.This }}" class="no-underline hover:underline text-gray-500">{{ slice $commit.This 0 8 }}</a>
           {{ if $commit.Parent }}
-          <i class="w-3 h-3 mx-1" data-lucide="arrow-left"></i>
+          {{ i "arrow-left" "w-3 h-3 mx-1" }}
           <a href="/{{ $repo }}/commit/{{ $commit.Parent }}" class="no-underline hover:underline text-gray-500">{{ slice $commit.Parent 0 8 }}</a>
           {{ end }}
       </p>
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index d4b4c0c..59d183e 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -49,7 +49,7 @@
         href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}"
         class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold"
     >
-        <i class="w-4 h-4" data-lucide="logs"></i>
+        {{ i "logs" "w-4 h-4" }}
         {{ .TotalCommits }}
         {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }}
     </a>
@@ -70,11 +70,8 @@
                         class="{{ $linkstyle }}"
                     >
                         <div class="flex items-center gap-2">
-                            <i
-                                class="w-3 h-3 fill-current"
-                                data-lucide="folder"
-                            ></i
-                            >{{ .Name }}
+                          {{ i "folder" "w-3 h-3 fill-current" }}
+                          {{ .Name }}
                         </div>
                     </a>
 
@@ -95,11 +92,7 @@
                         class="{{ $linkstyle }}"
                     >
                         <div class="flex items-center gap-2">
-                            <i
-                                class="w-3 h-3"
-                                data-lucide="file"
-                            ></i
-                            >{{ .Name }}
+                          {{ i "file" "w-3 h-3" }}{{ .Name }}
                         </div>
                     </a>
 
@@ -134,10 +127,7 @@
                                       class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded"
                                       hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')"
                                   >
-                                      <i
-                                          class="w-3 h-3"
-                                          data-lucide="ellipsis"
-                                      ></i>
+                                  {{ i "ellipsis" "w-3 h-3" }}
                                   </button>
                               {{ end }}
                           </div>
@@ -182,7 +172,7 @@
                     ></div>
                   {{ end }}
                   {{ range $tagsForCommit }}
-                    <span class="text-xs rounded bg-gray-100 font-mono px-2 mx-1/2 inline-flex items-center">
+                    <span class="text-xs rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center">
                       {{ . }}
                     </span>
                   {{ end }}
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index a32d2fb..0076084 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -19,7 +19,7 @@
         <div class="inline-flex items-center gap-2">
             <div id="state"
                 class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }} text-sm">
-                <i data-lucide="{{ $icon }}" class="w-4 h-4 mr-1.5 text-white" ></i>
+                {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
                 <span class="text-white">{{ .State }}</span>
             </div>
             <span class="text-gray-500 text-sm">
@@ -100,10 +100,7 @@
             class="mt-8"
         >
             <button type="submit" class="btn hover:bg-{{ $hoverColor }}-300">
-                <i
-                    data-lucide="{{ $icon }}"
-                    class="w-4 h-4 mr-2 text-{{ $hoverColor }}-400"
-                ></i>
+                {{ i $icon "w-4 h-4 mr-2" }}
                 <span class="text-black">{{ $action }}</span>
             </button>
             <div id="issue-action" class="error"></div>
diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html
index c343641..777e351 100644
--- a/appview/pages/templates/repo/issues/issues.html
+++ b/appview/pages/templates/repo/issues/issues.html
@@ -13,7 +13,7 @@
         <a
             href="/{{ .RepoInfo.FullName }}/issues/new"
             class="btn text-sm flex items-center gap-2 no-underline hover:no-underline">
-            <i data-lucide="plus" class="w-5 h-5"></i>
+            {{ i "plus" "w-4 h-4" }}
             <span>new issue</span>
         </a>
     </div>
@@ -44,7 +44,7 @@
       {{ end }}
 
       <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm">
-          <i data-lucide="{{ $icon }}" class="w-3 h-3 mr-1.5 text-white"></i>
+          {{ i $icon "w-3 h-3 mr-1.5 text-white" }}
           <span class="text-white">{{ $state }}</span>
       </span>
 
diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html
index 1e07ab5..a1639d8 100644
--- a/appview/pages/templates/repo/log.html
+++ b/appview/pages/templates/repo/log.html
@@ -75,10 +75,7 @@
                                                 class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded"
                                                 hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')"
                                             >
-                                                <i
-                                                    class="w-3 h-3"
-                                                    data-lucide="ellipsis"
-                                                ></i>
+                                            {{ i "ellipsis" "w-3 h-3" }}
                                             </button>
                                         {{ end }}
                                     </div>
@@ -138,7 +135,7 @@
                     hx-boost="true"
                     onclick="window.location.href = window.location.pathname + '?page={{ sub .Page 1 }}'"
                 >
-                    <i data-lucide="chevron-left" class="w-4 h-4"></i>
+                    {{ i "chevron-left" "w-4 h-4" }}
                     previous
                 </a>
             {{ else }}
@@ -152,7 +149,7 @@
                     onclick="window.location.href = window.location.pathname + '?page={{ add .Page 1 }}'"
                 >
                     next
-                    <i data-lucide="chevron-right" class="w-4 h-4"></i>
+                    {{ i "chevron-right" "w-4 h-4" }}
                 </a>
             {{ end }}
         </div>
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index 4090907..2f05c22 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -10,7 +10,7 @@
       <header class="pb-2">
           <div class="flex gap-3 items-center mb-3">
               <a href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/" class="flex items-center gap-2 font-medium">
-                <i data-lucide="arrow-left" class="w-5 h-5"></i>
+                {{ i "arrow-left" "w-5 h-5" }}
                 back
               </a>
               <span class="select-none before:content-['\00B7']"></span>
@@ -40,10 +40,7 @@
                   id="state"
                   class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"
               >
-                  <i
-                      data-lucide="{{ $icon }}"
-                      class="w-4 h-4 mr-1.5 text-white"
-                  ></i>
+                  {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
                   <span class="text-white">{{ .Pull.State.String }}</span>
               </div>
               <span class="text-gray-500 text-sm">
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 284ad85..578085c 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -27,10 +27,7 @@
                 id="state"
                 class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"
             >
-                <i
-                    data-lucide="{{ $icon }}"
-                    class="w-4 h-4 mr-1.5 text-white"
-                ></i>
+                {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
                 <span class="text-white">{{ .Pull.State.String }}</span>
             </div>
             <span class="text-gray-500 text-sm">
@@ -139,7 +136,7 @@
   <div class="bg-purple-50 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">
     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300"></div>
     <div class="flex items-center gap-2 text-purple-500">
-      <i data-lucide="git-merge" class="w-4 h-4"></i>
+      {{ i "git-merge" "w-4 h-4" }}
       <span class="font-medium">pull request successfully merged</span
       >
     </div>
@@ -148,16 +145,13 @@
     <div class="bg-red-50 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">
       <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300"></div>
       <div class="flex items-center gap-2 text-red-500">
-        <i data-lucide="alert-triangle" class="w-4 h-4"></i>
+        {{ i "triangle-alert" "w-4 h-4" }}
         <span class="font-medium">merge conflicts detected</span>
         <ul class="text-sm space-y-1">
           {{ range .MergeCheck.Conflicts }}
             {{ if .Filename }}
             <li class="flex items-center">
-              <i
-                  data-lucide="file-warning"
-                  class="w-3 h-3 mr-1.5 text-red-500"
-                  ></i>
+              {{ i "file-warning" "w-3 h-3 mr-1.5 text-red-500" }}
               <span class="font-mono">{{ slice .Filename 0 (sub (len .Filename) 2) }}</span>
             </li>
             {{ end }}
@@ -169,7 +163,7 @@
   <div class="bg-green-50 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">
     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300"></div>
     <div class="flex items-center gap-2 text-green-500">
-      <i data-lucide="check-circle" class="w-4 h-4"></i>
+      {{ i "circle-check-big" "w-4 h-4" }}
       <span class="font-medium">no conflicts, ready to merge</span>
     </div>
   </div>
@@ -191,7 +185,7 @@
       <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300"></div>
       <div class="flex flex-wrap gap-2">
           <button href="#" class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">
-              <i data-lucide="message-square-plus" class="w-4 h-4"></i>
+              {{ i "message-square-plus" "w-4 h-4" }}
               <span>comment</span>
           </button>
           {{ if and $isPushAllowed $isOpen }}
@@ -199,29 +193,39 @@
             {{ if $isConflicted }}
               {{ $disabled = "disabled" }}
             {{ end }}
-            <button href="#" class="btn p-2 flex items-center gap-2 no-underline hover:no-underline" {{ $disabled }}>
-                <i data-lucide="git-merge" class="w-4 h-4"></i>
+            <button 
+              hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge"
+              hx-swap="none"
+              hx-confirm="Are you sure you want to merge this pull request?"
+              class="btn p-2 flex items-center gap-2" {{ $disabled }}>
+              {{ i "git-merge" "w-4 h-4" }}
                 <span>merge</span>
             </button>
           {{ end }}
 
           {{ if and $isPullAuthor $isOpen }}
           <button href="#" class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">
-              <i data-lucide="rotate-ccw" class="w-4 h-4"></i>
+            {{ i "rotate-ccw" "w-4 h-4" }}
               <span>resubmit</span>
           </button>
           {{ end }}
 
           {{ if and $isPullAuthor $isPushAllowed $isOpen }}
-          <button href="#" class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">
-              <i data-lucide="ban" class="w-4 h-4"></i>
+          <button 
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"
+            hx-swap="none"
+            class="btn p-2 flex items-center gap-2">
+            {{ i "ban" "w-4 h-4" }}
               <span>close</span>
           </button>
           {{ end }}
 
           {{ if and $isPullAuthor $isPushAllowed $isClosed }}
-          <button href="#" class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">
-              <i data-lucide="circle-dot" class="w-4 h-4"></i>
+          <button 
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"
+            hx-swap="none"
+            class="btn p-2 flex items-center gap-2">
+            {{ i "circle-dot" "w-4 h-4" }}
               <span>reopen</span>
           </button>
           {{ end }}
@@ -270,7 +274,7 @@
       class="rounded relative bg-purple-50 border border-purple-200 p-4">
 
       <div class="flex items-center gap-2 text-purple-500">
-          <i data-lucide="git-merge" class="w-4 h-4"></i>
+        {{ i "git-merge" "w-4 h-4" }}
           <span class="font-medium"
               >pull request successfully merged</span
           >
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index 9b56102..ae9d2d6 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -24,7 +24,7 @@
             href="/{{ .RepoInfo.FullName }}/pulls/new"
             class="btn text-sm flex items-center gap-2 no-underline hover:no-underline"
         >
-            <i data-lucide="git-pull-request" class="w-5 h-5"></i>
+            {{ i "git-pull-request" "w-4 h-4" }}
             <span>new pull request</span>
         </a>
     </div>
@@ -57,10 +57,7 @@
                     <span
                         class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"
                     >
-                        <i
-                            data-lucide="{{ $icon }}"
-                            class="w-3 h-3 mr-1.5 text-white"
-                        ></i>
+                        {{ i $icon "w-3 h-3 mr-1.5 text-white" }}
                         <span class="text-white">{{ .State.String }}</span>
                     </span>
 
diff --git a/appview/pages/templates/repo/tree.html b/appview/pages/templates/repo/tree.html
index b1c48cc..9d5214a 100644
--- a/appview/pages/templates/repo/tree.html
+++ b/appview/pages/templates/repo/tree.html
@@ -41,7 +41,7 @@
         <div class="flex justify-between items-center">
             <a href="/{{ $.BaseTreeLink }}/{{ .Name }}" class="{{ $linkstyle }}">
                 <div class="flex items-center gap-2">
-                    <i class="w-3 h-3 fill-current" data-lucide="folder"></i>{{ .Name }}
+                  {{ i "folder" "w-3 h-3 fill-current" }}{{ .Name }}
                 </div>
             </a>
             <time class="text-xs text-gray-500">{{ timeFmt .LastCommit.When }}</time>
@@ -56,7 +56,7 @@
         <div class="flex justify-between items-center">
             <a href="/{{ $.BaseBlobLink }}/{{ .Name }}" class="{{ $linkstyle }}">
                 <div class="flex items-center gap-2">
-                    <i class="w-3 h-3" data-lucide="file"></i>{{ .Name }}
+                  {{ i "file" "w-3 h-3" }}{{ .Name }}
                 </div>
             </a>
             <time class="text-xs text-gray-500">{{ timeFmt .LastCommit.When }}</time>
diff --git a/appview/pages/templates/settings.html b/appview/pages/templates/settings.html
index bd71da3..15eada1 100644
--- a/appview/pages/templates/settings.html
+++ b/appview/pages/templates/settings.html
@@ -36,7 +36,7 @@
     <div class="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-4">
       <div class="flex flex-col gap-1">
         <div class="inline-flex items-center gap-4">
-          <i class="w-3 h-3" data-lucide="key"></i>
+          {{ i "key" "w-3 h-3" }}
           <p class="font-bold">{{ .Name }}</p>
         </div>
         <p class="text-sm text-gray-500">added {{ .Created | timeFmt }}</p>
@@ -48,8 +48,8 @@
         class="btn text-red-500 hover:text-red-700"
         title="Delete key"
         hx-delete="/settings/keys?name={{urlquery .Name}}&rkey={{urlquery .Rkey}}&key={{urlquery .Key}}"
-        hx-confirm="Are you sure you wish to delete the key '{{ .Name }}'?">
-        <i class="w-5 h-5" data-lucide="trash-2"></i>
+        hx-confirm="Are you sure you want to delete the key '{{ .Name }}'?">
+        {{ i "trash-2" "w-5 h-5" }}
         <span class="hidden md:inline">delete</span> 
       </button>
     </div>
@@ -91,7 +91,7 @@
     <div class="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-4">
       <div class="flex flex-col gap-2">
         <div class="inline-flex items-center gap-4">
-          <i class="w-3 h-3" data-lucide="mail"></i>
+          {{ i "mail" "w-3 h-3" }}
           <p class="font-bold">{{ .Address }}</p>
           <div class="inline-flex items-center gap-1">
             {{ if .Verified }}
@@ -114,7 +114,7 @@
           hx-swap="none"
           href="#"
           hx-vals='{"email": "{{ .Address }}"}'>
-          <i class="w-5 h-5" data-lucide="rotate-cw"></i>
+          {{ i "rotate-cw" "w-5 h-5" }}
           <span class="hidden md:inline">resend</span> 
         </button>
         {{ end }}
@@ -135,7 +135,7 @@
             class="btn text-red-500 hover:text-red-700"
             title="Delete email"
             type="submit">
-            <i class="w-5 h-5" data-lucide="trash-2"></i>
+            {{ i "trash-2" "w-5 h-5" }}
             <span class="hidden md:inline">delete</span> 
           </button>
         </form>
diff --git a/appview/pages/templates/timeline.html b/appview/pages/templates/timeline.html
index fa500cf..63f1eef 100644
--- a/appview/pages/templates/timeline.html
+++ b/appview/pages/templates/timeline.html
@@ -22,7 +22,7 @@
     tangled
   </div>
   <div class="italic text-lg">
-    tightly-knit social coding, <a href="/login" class="underline inline-flex gap-1 items-center">join now <i data-lucide="arrow-right" class="w-4 h-4"></i></a>
+    tightly-knit social coding, <a href="/login" class="underline inline-flex gap-1 items-center">join now {{ i "arrow-right" "w-4 h-4" }}</a>
     <p class="pt-5 px-10 text-sm text-gray-500">Join our IRC channel: <a href="https://web.libera.chat/#tangled"><code>#tangled</code> on Libera Chat</a>.
     Read an introduction to Tangled <a href="https://blog.tangled.sh/intro">here</a>.</p>
   </div>
diff --git a/appview/pages/templates/user/profile.html b/appview/pages/templates/user/profile.html
index 6d81496..ac59c0a 100644
--- a/appview/pages/templates/user/profile.html
+++ b/appview/pages/templates/user/profile.html
@@ -62,10 +62,7 @@
 
                     {{ if .RepoStats.StarCount }}
                         <div class="flex gap-1 items-center text-sm">
-                            <span
-                                class="w-3 h-3 fill-current"
-                                data-lucide="star"
-                            ></span>
+                            {{ i "star" "w-3 h-3 fill-current" }}
                             <span>{{ .RepoStats.StarCount }}</span>
                         </div>
                     {{ end }}
@@ -100,10 +97,7 @@
 
                     {{ if .RepoStats.StarCount }}
                         <div class="flex gap-1 items-center text-sm">
-                            <span
-                                class="w-3 h-3 fill-current"
-                                data-lucide="star"
-                            ></span>
+                            {{ i "star" "w-3 h-3 fill-current" }}
                             <span>{{ .RepoStats.StarCount }}</span>
                         </div>
                     {{ end }}
diff --git a/appview/state/pull.go b/appview/state/pull.go
index dc9094b..218801f 100644
--- a/appview/state/pull.go
+++ b/appview/state/pull.go
@@ -94,8 +94,6 @@ func (s *State) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	log.Println(mergeCheckResponse)
-
 	s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
 		LoggedInUser: user,
 		RepoInfo:     f.RepoInfo(s, user),
diff --git a/flake.lock b/flake.lock
index 331a4bc..e10b5b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,13 +67,14 @@
     "lucide-src": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-5ipNSxTlQ7627lGgsyZxk7vS1sr9RkrlR8/QMj2Zg6s=",
-        "type": "file",
-        "url": "https://unpkg.com/lucide@0.482.0"
+        "lastModified": 1742302029,
+        "narHash": "sha256-OyPVtpnC4/AAmPq84Wt1r1Gcs48d9KG+UBCtZK87e9k=",
+        "type": "tarball",
+        "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"
       },
       "original": {
-        "type": "file",
-        "url": "https://unpkg.com/lucide@0.482.0"
+        "type": "tarball",
+        "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"
       }
     },
     "nixpkgs": {
diff --git a/flake.nix b/flake.nix
index 9e8ff3e..637929e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
       flake = false;
     };
     lucide-src = {
-      url = "https://unpkg.com/lucide@0.482.0";
+      url = "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip";
       flake = false;
     };
     ia-fonts-src = {
@@ -71,9 +71,9 @@
           src = gitignoreSource ./.;
           postUnpack = ''
             pushd source
+            mkdir -p appview/pages/static/{fonts,icons}
             cp -f ${htmx-src} appview/pages/static/htmx.min.js
-            cp -f ${lucide-src} appview/pages/static/lucide.min.js
-            mkdir -p appview/pages/static/fonts
+            cp -rf ${lucide-src}/*.svg appview/pages/static/icons/
             cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf appview/pages/static/fonts/
             cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf appview/pages/static/fonts/
             ${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o appview/pages/static/tw.css
@@ -150,9 +150,9 @@
           pkgs.nixos-shell
         ];
         shellHook = ''
+          mkdir -p appview/pages/static/{fonts,icons}
           cp -f ${htmx-src} appview/pages/static/htmx.min.js
-          cp -f ${lucide-src} appview/pages/static/lucide.min.js
-          mkdir -p appview/pages/static/fonts/
+          cp -rf ${lucide-src}/*.svg appview/pages/static/icons/
           cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf appview/pages/static/fonts/
           cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf appview/pages/static/fonts/
         '';