diff --git a/pages/episode/episode.pixy b/pages/episode/episode.pixy
index 80375b97..22355f6b 100644
--- a/pages/episode/episode.pixy
+++ b/pages/episode/episode.pixy
@@ -5,18 +5,16 @@ component AnimeEpisode(anime *arn.Anime, episode *arn.AnimeEpisode, user *arn.Us
 	.episode-view-image-container
 		if episodeIndex > 0
 			.episode-arrow.episode-arrow-previous
-				a.button.tip(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[episodeIndex - 1].Number), aria-label="Previous episode")
-					Icon("chevron-left")
-					span= anime.Episodes().Items[episodeIndex - 1].Number
+				a.light-button(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[episodeIndex - 1].Number), title="Previous episode")
+					RawIcon("chevron-left")
 				
 		a(href=anime.Link(), title=anime.Title.ByUser(user))
 			img.anime-cover-image.lazy(data-src=anime.ImageLink("large"), data-webp="true", data-color=anime.AverageColor(), alt=anime.Title.ByUser(user))
 
 		if episodeIndex < len(anime.Episodes().Items) - 1
 			.episode-arrow.episode-arrow-next
-				a.button.tip(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[episodeIndex + 1].Number), aria-label="Next episode")
-					Icon("chevron-right")
-					span= anime.Episodes().Items[episodeIndex + 1].Number
+				a.light-button(href=anime.Link() + "/episode/" + strconv.Itoa(anime.Episodes().Items[episodeIndex + 1].Number), title="Next episode")
+					RawIcon("chevron-right")
 
 	h3.episode-view-number= "Episode " + strconv.Itoa(episode.Number)
 
diff --git a/pages/episode/episode.scarlet b/pages/episode/episode.scarlet
index 5026022d..0c334aec 100644
--- a/pages/episode/episode.scarlet
+++ b/pages/episode/episode.scarlet
@@ -22,9 +22,17 @@
 .episode-arrow
 	position absolute
 	top 50%
+	z-index 1
 
 .episode-arrow-previous
-	left 0
+	left calc(content-padding * -1 + 3px)
 
 .episode-arrow-next
-	right 0
\ No newline at end of file
+	right calc(content-padding * -1 + 3px)
+
+> 500px
+	.episode-arrow-previous
+		left 0
+
+	.episode-arrow-next
+		right 0
\ No newline at end of file
diff --git a/styles/light-button.scarlet b/styles/light-button.scarlet
index 1426c3cc..25ad0c75 100644
--- a/styles/light-button.scarlet
+++ b/styles/light-button.scarlet
@@ -4,7 +4,8 @@
 
 .light-button
 	horizontal
-	display inline-block
+	justify-content center
+	align-items center
 	padding 0.5rem 1rem
 	border-radius ui-element-border-radius
 	font-size 0.9rem