diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index c2b33891b..4aacbfbf9 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -105,8 +105,8 @@
     var $dest = $("#related-tags");
     $dest.empty();
 
-    $dest.append(this.build_html("recent", this.other_tags(Danbooru.Cookie.get("recent_tags"))));
-    $dest.append(this.build_html("frequent", this.other_tags(Danbooru.meta("favorite-tags"))));
+    $dest.append(this.build_html("recent", this.other_tags(Danbooru.Cookie.get("recent_tags_with_categories"))));
+    $dest.append(this.build_html("frequent", this.other_tags(Danbooru.Cookie.get("favorite_tags_with_categories"))));
     $dest.append(this.build_html(query, related_tags));
     if (wiki_page_tags.length) {
       $dest.append(Danbooru.RelatedTag.build_html("wiki:" + query, wiki_page_tags));
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index ff3641ca8..219cf6608 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -90,8 +90,9 @@ private
   def save_recent_tags
     if @post
       tags = Tag.scan_tags(@post.tag_string)
-      tags = TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])
-      cookies[:recent_tags] = Tag.categories_for(tags.uniq.slice(0, 30)).to_a.flatten.join(" ")
+      tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).uniq.slice(0, 30)
+      cookies[:recent_tags] = tags.join(" ")
+      cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
     end
   end
 end
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 5992db37f..35eeee7f3 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -53,8 +53,9 @@ protected
   def save_recent_tags
     if @upload
       tags = Tag.scan_tags(@upload.tag_string)
-      tags = TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])
-      cookies[:recent_tags] = Tag.categories_for(tags.uniq.slice(0, 30).join(" ")).to_a.flatten.join(" ")
+      tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).uniq.slice(0, 30)
+      cookies[:recent_tags] = tags.join(" ")
+      cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
     end
   end
 end
diff --git a/app/logical/session_loader.rb b/app/logical/session_loader.rb
index c57196421..9c6972346 100644
--- a/app/logical/session_loader.rb
+++ b/app/logical/session_loader.rb
@@ -84,7 +84,9 @@ private
 
   def store_favorite_tags_in_cookies
     if cookies[:favorite_tags].blank? && CurrentUser.user.favorite_tags.present?
-      cookies[:favorite_tags] = Tag.categories_for(CurrentUser.user.favorite_tags.scan(/\S+/)).to_a.flatten.join(" ")
+      favorite_tags = CurrentUser.user.favorite_tags.slice(0, 1024)
+      cookies[:favorite_tags] = favorite_tags
+      cookies[:favorite_tags_with_categories] = Tag.categories_for(favorite_tags.scan(/\S+/)).to_a.flatten.join(" ")
     end
   end
 
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index ccf2a3446..3e4bbe2ff 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -107,7 +107,6 @@
   <meta name="post-is-flagged" content="<%= @post.is_flagged? %>">
   <meta name="config-large-width" content="<%= Danbooru.config.large_image_width %>">
   <meta name="always-resize-images" content="<%= CurrentUser.user.always_resize_images? %>">
-  <meta name="favorite-tags" content="<%= cookies[:favorite_tags] %>">
   <meta property="og:title" content="<%= h @post.presenter.humanized_essential_tag_string %> - <%= Danbooru.config.app_name %>">
   <meta property="og:description" content="<%= h @post.presenter.humanized_tag_string %>">
   <meta property="og:image" content="<%= @post.preview_file_url %>">
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index d6b04568f..9812b1f85 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -89,8 +89,4 @@
   Upload - <%= Danbooru.config.app_name %>
 <% end %>
 
-<% content_for(:html_header) do %>
-  <meta name="favorite-tags" content="<%= cookies[:favorite_tags] %>">
-<% end %>
-
 <%= render "posts/partials/common/secondary_links" %>
diff --git a/public/images/animated-overlay.gif b/public/images/animated-overlay.gif
new file mode 100755
index 000000000..d441f75eb
Binary files /dev/null and b/public/images/animated-overlay.gif differ
diff --git a/public/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2ab..536b49f41 100755
Binary files a/public/images/ui-bg_flat_0_aaaaaa_40x100.png and b/public/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/public/images/ui-bg_flat_50_dadada_40x100.png b/public/images/ui-bg_flat_50_dadada_40x100.png
new file mode 100755
index 000000000..2bdcb43ab
Binary files /dev/null and b/public/images/ui-bg_flat_50_dadada_40x100.png differ
diff --git a/public/images/ui-bg_flat_55_fbf9ee_40x100.png b/public/images/ui-bg_flat_55_fbf9ee_40x100.png
new file mode 100755
index 000000000..645f8ecd9
Binary files /dev/null and b/public/images/ui-bg_flat_55_fbf9ee_40x100.png differ
diff --git a/public/images/ui-bg_flat_75_ffffff_40x100.png b/public/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229af..d262048da 100755
Binary files a/public/images/ui-bg_flat_75_ffffff_40x100.png and b/public/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/public/images/ui-bg_flat_95_fef1ec_40x100.png b/public/images/ui-bg_flat_95_fef1ec_40x100.png
new file mode 100755
index 000000000..f5c4e6fe3
Binary files /dev/null and b/public/images/ui-bg_flat_95_fef1ec_40x100.png differ
diff --git a/public/images/ui-bg_highlight-soft_0_aaaaaa_1x100.png b/public/images/ui-bg_highlight-soft_0_aaaaaa_1x100.png
new file mode 100755
index 000000000..430f8dd5d
Binary files /dev/null and b/public/images/ui-bg_highlight-soft_0_aaaaaa_1x100.png differ
diff --git a/public/images/ui-bg_highlight-soft_65_ffffff_1x100.png b/public/images/ui-bg_highlight-soft_65_ffffff_1x100.png
new file mode 100755
index 000000000..8f0826ed2
Binary files /dev/null and b/public/images/ui-bg_highlight-soft_65_ffffff_1x100.png differ
diff --git a/public/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c6e..a76fd9857 100755
Binary files a/public/images/ui-bg_highlight-soft_75_cccccc_1x100.png and b/public/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/public/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png b/public/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png
new file mode 100755
index 000000000..d55ee9e50
Binary files /dev/null and b/public/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png differ
diff --git a/public/images/ui-icons_222222_256x240.png b/public/images/ui-icons_222222_256x240.png
index b273ff111..c1cb1170c 100755
Binary files a/public/images/ui-icons_222222_256x240.png and b/public/images/ui-icons_222222_256x240.png differ
diff --git a/public/images/ui-icons_2e83ff_256x240.png b/public/images/ui-icons_2e83ff_256x240.png
index 09d1cdc85..84b601bf0 100755
Binary files a/public/images/ui-icons_2e83ff_256x240.png and b/public/images/ui-icons_2e83ff_256x240.png differ
diff --git a/public/images/ui-icons_454545_256x240.png b/public/images/ui-icons_454545_256x240.png
index 59bd45b90..b6db1acdd 100755
Binary files a/public/images/ui-icons_454545_256x240.png and b/public/images/ui-icons_454545_256x240.png differ
diff --git a/public/images/ui-icons_888888_256x240.png b/public/images/ui-icons_888888_256x240.png
index 6d02426c1..feea0e202 100755
Binary files a/public/images/ui-icons_888888_256x240.png and b/public/images/ui-icons_888888_256x240.png differ
diff --git a/public/images/ui-icons_cd0a0a_256x240.png b/public/images/ui-icons_cd0a0a_256x240.png
index 2ab019b73..ed5b6b093 100755
Binary files a/public/images/ui-icons_cd0a0a_256x240.png and b/public/images/ui-icons_cd0a0a_256x240.png differ