diff --git a/src/General/css/style.css b/src/General/css/style.css
index dde08338b..b28555946 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -1517,8 +1517,9 @@ div.boardTitle {
 }
 /* Link Title Favicons */
 <%=
-'YouTube Vimeo SoundCloud audio LiveLeak Vocaroo pastebin gist image InstallGentoo video gfycat'.split(' ').map(function(key) {
-  var data = grunt.file.read('src/General/img/links/' + key.toLowerCase() + '.png', {encoding: 'base64'});
+grunt.file.expand('src/General/img/links/*.png').map(function(file) {
+  var key  = file.match(/(\w+)\.png/)[1];
+  var data = grunt.file.read(file, {encoding: 'base64'});
   return ".linkify."+key+" {\n" +
   "  background: transparent url('data:image/png;base64,"+data+"') center left no-repeat!important;\n" +
   "  padding-left: 18px;\n" +
diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee
index a422bf4b8..139fa927b 100644
--- a/src/Linkification/Embedding.coffee
+++ b/src/Linkification/Embedding.coffee
@@ -49,7 +49,7 @@ Embedding =
 
     embed.dataset[name] = value for name, value of {key, uid, options}
 
-    $.addClass link, "#{embed.dataset.key}"
+    $.addClass link, key.toLowerCase()
 
     $.on embed, 'click', Embedding.cb.toggle
     $.after link, [$.tn(' '), embed]