diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index aa840ce..7f7bec9 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -4,6 +4,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
     <title>Discord Bot</title>
+    <link rel="icon"
+          type="image/x-icon"
+          href="favicon.ico"/>
 
     <!-- CSS  -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>
diff --git a/src/main/resources/templates/music.html b/src/main/resources/templates/music.html
index 7ac65a4..bd5b0be 100644
--- a/src/main/resources/templates/music.html
+++ b/src/main/resources/templates/music.html
@@ -3,7 +3,10 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
-    <title>Discord Bot - Music Control</title>
+    <title>Music Control - Discord Bot</title>
+    <link rel="icon"
+          type="image/x-icon"
+          href="favicon.ico"/>
 
     <!-- CSS  -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>
@@ -15,7 +18,7 @@
 
 <nav class="blue-grey darken-4 z-depth-3" role="navigation">
     <div class="nav-wrapper container">
-        <a id="logo-container" href="#" class="brand-logo">Discord Bot</a>
+        <a id="logo-container" href="/" class="brand-logo">Discord Bot</a>
         <ul class="right hide-on-med-and-down">
 
             <li >
