diff --git a/src/main.rs b/src/main.rs
index 6e35cf0..a1f72fd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -175,6 +175,7 @@ async fn main() -> tide::Result<()> {
 	app.at("/vid/:id/:size/").get(proxy::video);
 	app.at("/img/:id/").get(proxy::image);
 	app.at("/thumb/:point/:id/").get(proxy::thumbnail);
+	app.at("/emoji/:id/:name/").get(proxy::emoji);
 
 	// Browse user profile
 	app.at("/u/:name/").get(user::profile);
diff --git a/src/proxy.rs b/src/proxy.rs
index f49f1c6..c1deee9 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -51,6 +51,13 @@ pub async fn thumbnail(req: Request<()>) -> tide::Result {
 	request(url).await
 }
 
+pub async fn emoji(req: Request<()>) -> tide::Result {
+	let id = req.param("id").unwrap_or_default();
+	let name = req.param("name").unwrap_or_default();
+	let url = format!("https://emoji.redditmedia.com/{}/{}", id, name);
+	request(url).await
+}
+
 async fn request(url: String) -> tide::Result {
 	let http = surf::get(url).await.unwrap();
 
diff --git a/src/utils.rs b/src/utils.rs
index cf6168b..2e83841 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -188,27 +188,25 @@ pub fn format_url(url: &str) -> String {
 	} else {
 		let domain = Url::parse(url).map(|f| f.domain().unwrap_or_default().to_owned()).unwrap_or_default();
 
-		let capture = |regex: &str, format: &str| {
+		let capture = |regex: &str, format: &str, levels: i16| {
 			Regex::new(regex)
 				.map(|re| match re.captures(url) {
-					Some(caps) => [format, &caps[1], "/"].join(""),
+					Some(caps) => match levels {
+						1 => [format, &caps[1], "/"].join(""),
+						2 => [format, &caps[1], "/", &caps[2], "/"].join(""),
+						_ => String::new()
+					},
 					None => String::new(),
 				})
 				.unwrap_or_default()
 		};
 
 		match domain.as_str() {
-			"v.redd.it" => {
-				let re = Regex::new(r"https://v\.redd\.it/(.*)/DASH_([0-9]{2,4}(\.mp4|$))").unwrap();
-
-				match re.captures(url) {
-					Some(caps) => format!("/vid/{}/{}", &caps[1], &caps[2]),
-					None => String::new(),
-				}
-			}
-			"i.redd.it" => capture(r"https://i\.redd\.it/(.*)", "/img/"),
-			"a.thumbs.redditmedia.com" => capture(r"https://a\.thumbs\.redditmedia\.com/(.*)", "/thumb/a/"),
-			"b.thumbs.redditmedia.com" => capture(r"https://b\.thumbs\.redditmedia\.com/(.*)", "/thumb/b/"),
+			"v.redd.it" => capture(r"https://v\.redd\.it/(.*)/DASH_([0-9]{2,4}(\.mp4|$))", "/vid/", 2),
+			"i.redd.it" => capture(r"https://i\.redd\.it/(.*)", "/img/", 1),
+			"a.thumbs.redditmedia.com" => capture(r"https://a\.thumbs\.redditmedia\.com/(.*)", "/thumb/a/", 1),
+			"b.thumbs.redditmedia.com" => capture(r"https://b\.thumbs\.redditmedia\.com/(.*)", "/thumb/b/", 1),
+			"emoji.redditmedia.com" => capture(r"https://emoji\.redditmedia\.com/(.*)/(.*)", "/emoji/", 2),
 			_ => format!("/proxy/{}/", encode(url).as_str()),
 		}
 	}