diff --git a/mixins/Navigation.pixy b/mixins/Navigation.pixy
index 156546c2..dbf99a82 100644
--- a/mixins/Navigation.pixy
+++ b/mixins/Navigation.pixy
@@ -7,7 +7,7 @@ component Navigation(user *arn.User)
 component LoggedOutMenu
 	nav#navigation.logged-out
 		NavigationButton("About", "/", "question-circle")
-		NavigationButton("Anime", "/anime", "television")
+		NavigationButton("Music", "/music", "headphones")
 		NavigationButton("Forum", "/forum", "comment")
 
 		FuzzySearch
@@ -26,7 +26,7 @@ component LoggedInMenu(user *arn.User)
 		NavigationButton("Dash", "/", "dashboard")
 		NavigationButton("Profile", "/+", "user")
 		NavigationButton("Forum", "/forum", "comment")
-		NavigationButton("Music", "/music", "music")
+		NavigationButton("Music", "/music", "headphones")
 
 		FuzzySearch
 
@@ -37,7 +37,7 @@ component LoggedInMenu(user *arn.User)
 			NavigationButton("Airing", "/airing", "th")
 		
 		NavigationButton("Settings", "/settings", "cog")
-			
+		
 		.extra-navigation
 			NavigationButtonNoAJAX("Logout", "/logout", "sign-out")
 
diff --git a/pages/music/music.go b/pages/music/music.go
index 490a9930..b2d0d24a 100644
--- a/pages/music/music.go
+++ b/pages/music/music.go
@@ -1,8 +1,9 @@
 package music
 
 import "github.com/aerogo/aero"
+import "github.com/animenotifier/notify.moe/components"
 
 // Get renders the music page.
 func Get(ctx *aero.Context) string {
-	return ctx.HTML("Coming soon.")
+	return ctx.HTML(components.Music())
 }
diff --git a/pages/music/music.pixy b/pages/music/music.pixy
new file mode 100644
index 00000000..046d14fa
--- /dev/null
+++ b/pages/music/music.pixy
@@ -0,0 +1,5 @@
+component Music
+	h2.page-title Music
+
+	iframe(src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/127672476&auto_play=false&hide_related=false&show_comments=true&show_user=true&show_reposts=false&visual=true")
+	//- <iframe width="100%" height="450" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/127672476&amp;auto_play=false&amp;hide_related=false&amp;show_comments=true&amp;show_user=true&amp;show_reposts=false&amp;visual=true"></iframe>
\ No newline at end of file
diff --git a/styles/icons.scarlet b/styles/icons.scarlet
index dd1085d2..9cfeed76 100644
--- a/styles/icons.scarlet
+++ b/styles/icons.scarlet
@@ -10,4 +10,7 @@
 	width 1em
 	height 1em
 	min-width 1em
-	fill currentColor
\ No newline at end of file
+	fill currentColor
+
+.icon-headphones
+	transform translateY(2px)
\ No newline at end of file
diff --git a/utils/icons.go b/utils/icons.go
index f830531e..87886781 100644
--- a/utils/icons.go
+++ b/utils/icons.go
@@ -11,9 +11,9 @@ func init() {
 	files, _ := ioutil.ReadDir("images/icons/")
 
 	for _, file := range files {
-		name := strings.Replace(file.Name(), ".svg", "", 1)
+		name := strings.TrimSuffix(file.Name(), ".svg")
 		data, _ := ioutil.ReadFile("images/icons/" + name + ".svg")
-		svgIcons[name] = strings.Replace(string(data), "<svg ", "<svg class='icon' ", 1)
+		svgIcons[name] = strings.Replace(string(data), "<svg ", "<svg class='icon icon-"+name+"' ", 1)
 	}
 }