diff --git a/web/static/favicon.ico b/web/static/favicon.ico
new file mode 100644
index 0000000..1578681
Binary files /dev/null and b/web/static/favicon.ico differ
diff --git a/web/views/404.templ b/web/views/404.templ
index 6edb6f2..0ddd204 100644
--- a/web/views/404.templ
+++ b/web/views/404.templ
@@ -3,7 +3,7 @@ package views
 import "github.com/dominicf2001/comfychan/web/views/shared"
 
 templ NotFound() {
-	@shared.Layout() {
+	@shared.Layout("404 - Comfychan") {
 		<div class="container not-found-container">
 			<div class="box">
 				<h2>404 not found.</h2>
diff --git a/web/views/admin/login.templ b/web/views/admin/login.templ
index 4588ac8..35b355f 100644
--- a/web/views/admin/login.templ
+++ b/web/views/admin/login.templ
@@ -3,7 +3,7 @@ package admin
 import "github.com/dominicf2001/comfychan/web/views/shared"
 
 templ AdminLogin() {
-	@shared.Layout() {
+	@shared.Layout("Authorize - Comfychan") {
 		<div class="admin-login-container">
 			<div style="display: none" id="adminLoginWarning" class="warning"></div>
 			<form
diff --git a/web/views/board.templ b/web/views/board.templ
index 3f2cb63..2992534 100644
--- a/web/views/board.templ
+++ b/web/views/board.templ
@@ -20,7 +20,7 @@ templ BoardHeader(board database.Board) {
 }
 
 templ Board(board database.Board, isAdmin bool) {
-	@shared.Layout() {
+	@shared.Layout(fmt.Sprintf("/%s/ - %s", board.Slug, board.Name)) {
 		@BoardHeader(board)
 		<div class="new-post-container">
 			<button
diff --git a/web/views/index.templ b/web/views/index.templ
index e495cd1..576e685 100644
--- a/web/views/index.templ
+++ b/web/views/index.templ
@@ -3,7 +3,7 @@ package views
 import "github.com/dominicf2001/comfychan/web/views/shared"
 
 templ Index() {
-	@shared.Layout() {
+	@shared.Layout("Comfychan") {
 		<section class="container">
 			<img id="clavis" src="/static/media/clavis.png"/>
 			<div class="box">
diff --git a/web/views/shared/layout.templ b/web/views/shared/layout.templ
index 6e1e402..4159f28 100644
--- a/web/views/shared/layout.templ
+++ b/web/views/shared/layout.templ
@@ -1,17 +1,18 @@
 package shared
 
-templ Layout() {
+templ Layout(title string) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
 			<meta charset="UTF-8"/>
 			<meta name="viewport" content="width=device-width,initial-scale=1"/>
-			<title>Comfychan</title>
+			<title>{ title }</title>
 			<script src="https://unpkg.com/htmx.org@2.0.4"></script>
 			<script src="https://unpkg.com/hyperscript.org@0.9.14"></script>
 			<script src="/static/index.js"></script>
 			<link rel="stylesheet" href="/static/reset.css"/>
 			<link rel="stylesheet" href="/static/index.css"/>
+			<link rel="icon" type="image/x-icon" href="/static/favicon.ico"/>
 		</head>
 		<body>
 			<div id="boardList">
diff --git a/web/views/thread.templ b/web/views/thread.templ
index e3f4915..11b4a10 100644
--- a/web/views/thread.templ
+++ b/web/views/thread.templ
@@ -219,7 +219,7 @@ templ ThreadActionBar(thread database.Thread, pos string) {
 }
 
 templ Thread(board database.Board, thread database.Thread, posts []database.Post, threadContext ThreadContext) {
-	@shared.Layout() {
+	@shared.Layout(fmt.Sprintf("/%s/ - %s", board.Slug, thread.Subject+" "+posts[0].Body)) {
 		<script src="/static/thread.js" defer></script>
 		@BoardHeader(board)
 		<div class="new-post-container">
