diff --git a/apps/rss_feeds/page_importer.py b/apps/rss_feeds/page_importer.py
index ba4cc68a0..0fbc39593 100644
--- a/apps/rss_feeds/page_importer.py
+++ b/apps/rss_feeds/page_importer.py
@@ -24,6 +24,7 @@ BROKEN_PAGES = [
 # Also change in reader_utils.js.
 BROKEN_PAGE_URLS = [
     'nytimes.com',
+    'github.com',
     'washingtonpost.com',
     'stackoverflow.com',
     'stackexchange.com',
diff --git a/media/css/reader.css b/media/css/reader.css
index c00cfb9aa..57c36117f 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -684,20 +684,20 @@ body {
 .NB-feedlist .folder .folder_title .NB-feedlist-collapse-icon,
 .NB-feeds-header .NB-feedlist-collapse-icon {
     position: absolute;
-    top: 3px;
-    right: 4px;
+    top: 5px;
+    right: 3px;
     width: 16px;
     height: 16px;
-    background: transparent url('/media/embed/reader/toggle_minus.png') no-repeat 0 0;
-    background-size: 16px;
+    background: transparent url('/media/embed/icons/circular/folder_collapse.png') no-repeat 0 0;
+    background-size: 13px 12px;
     opacity: .6;
     display: none;
 }
 
 .NB-feedlist .folder.NB-folder-collapsed .folder_title .NB-feedlist-collapse-icon,
 .NB-feeds-header.NB-folder-collapsed .NB-feedlist-collapse-icon {
-    background-image: url('/media/embed/reader/toggle_plus.png');
-    background-size: 16px;
+    background-image: url('/media/embed/icons/circular/folder_expand.png');
+    background-size: 13px 12px;
 }
 
 .NB-feedlist .folder .folder_title:hover .NB-feedlist-collapse-icon:hover,
@@ -5635,13 +5635,16 @@ form.opml_import_form input {
     background: transparent url('/media/embed/icons/silk/user_orange.png') no-repeat  0 1px;
 }
 .NB-menu-manage .NB-menu-manage-keyboard .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/keyboard.png') no-repeat  0 1px;    
+    background: transparent url('/media/embed/icons/circular/menu_icn_keyboard.png') no-repeat  0 1px;    
+    background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-tutorial .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/map.png') no-repeat  0 1px;    
+    background: transparent url('/media/embed/icons/circular/menu_icn_tips.png') no-repeat  0 1px;    
+    background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-feed-exception .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/exclamation.png') no-repeat  0 1px;    
+    background: transparent url('/media/embed/icons/circular/newuser_icn_sharewith_active.png') no-repeat  0 1px;    
+    background-size: 18px;
 }
 
 .NB-menu-manage .NB-menu-manage-delete .NB-menu-manage-image {
@@ -5790,20 +5793,24 @@ form.opml_import_form input {
     background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-goodies .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/package_green.png') no-repeat  0 1px;
+    background: transparent url('/media/embed/icons/circular/menu_icn_goodies.png') no-repeat  0 1px;
+    background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-friends .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/circular/share.png') no-repeat 0 1px;
+    background: transparent url('/media/embed/icons/circular/menu_icn_followers.png') no-repeat 2px 1px;
     background-size: 16px;
 }
 .NB-menu-manage .NB-menu-manage-profile-editor .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/user_orange.png') no-repeat  0 1px;
+    background: transparent url('/media/embed/icons/circular/menu_icn_fetch_subscribers.png') no-repeat  0 0;
+    background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-preferences .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/color_wheel.png') no-repeat  0 1px;
+    background: transparent url('/media/embed/icons/circular/menu_icn_preferences.png') no-repeat  0 0;
+    background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-account .NB-menu-manage-image {
-    background: transparent url('/media/embed/icons/silk/weather_sun.png') no-repeat  0 1px;
+    background: transparent url('/media/embed/icons/circular/menu_icn_profile.png') no-repeat  0 0;
+    background-size: 18px;
 }
 .NB-menu-manage .NB-menu-manage-feedchooser .NB-menu-manage-image {
     background: transparent url('/media/embed/icons/silk/color_swatch.png') no-repeat  0 2px;
diff --git a/media/img/icons/circular/folder_collapse.png b/media/img/icons/circular/folder_collapse.png
new file mode 100644
index 000000000..9e2626085
Binary files /dev/null and b/media/img/icons/circular/folder_collapse.png differ
diff --git a/media/img/icons/circular/folder_expand.png b/media/img/icons/circular/folder_expand.png
new file mode 100644
index 000000000..6ccc612c6
Binary files /dev/null and b/media/img/icons/circular/folder_expand.png differ
diff --git a/media/img/icons/circular/g_icn_unreadhid.png b/media/img/icons/circular/g_icn_unreadhid.png
new file mode 100644
index 000000000..78f1c2021
Binary files /dev/null and b/media/img/icons/circular/g_icn_unreadhid.png differ
diff --git a/media/img/icons/circular/menu_icn_account.png b/media/img/icons/circular/menu_icn_account.png
new file mode 100644
index 000000000..17443ab68
Binary files /dev/null and b/media/img/icons/circular/menu_icn_account.png differ
diff --git a/media/img/icons/circular/menu_icn_account_128.png b/media/img/icons/circular/menu_icn_account_128.png
new file mode 100644
index 000000000..90f077912
Binary files /dev/null and b/media/img/icons/circular/menu_icn_account_128.png differ
diff --git a/media/img/icons/circular/menu_icn_followers.png b/media/img/icons/circular/menu_icn_followers.png
new file mode 100644
index 000000000..517d653a6
Binary files /dev/null and b/media/img/icons/circular/menu_icn_followers.png differ
diff --git a/media/img/icons/circular/menu_icn_goodies.png b/media/img/icons/circular/menu_icn_goodies.png
new file mode 100644
index 000000000..ecf676fc4
Binary files /dev/null and b/media/img/icons/circular/menu_icn_goodies.png differ
diff --git a/media/img/icons/circular/menu_icn_goodies_128.png b/media/img/icons/circular/menu_icn_goodies_128.png
new file mode 100644
index 000000000..1d93e6d28
Binary files /dev/null and b/media/img/icons/circular/menu_icn_goodies_128.png differ
diff --git a/media/img/icons/circular/menu_icn_keyboard.png b/media/img/icons/circular/menu_icn_keyboard.png
new file mode 100644
index 000000000..8bf558dcf
Binary files /dev/null and b/media/img/icons/circular/menu_icn_keyboard.png differ
diff --git a/media/img/icons/circular/menu_icn_keyboard_128.png b/media/img/icons/circular/menu_icn_keyboard_128.png
new file mode 100644
index 000000000..c7abe722e
Binary files /dev/null and b/media/img/icons/circular/menu_icn_keyboard_128.png differ
diff --git a/media/img/icons/circular/menu_icn_markread_128.png b/media/img/icons/circular/menu_icn_markread_128.png
new file mode 100644
index 000000000..8cbb070d1
Binary files /dev/null and b/media/img/icons/circular/menu_icn_markread_128.png differ
diff --git a/media/img/icons/circular/menu_icn_preferences.png b/media/img/icons/circular/menu_icn_preferences.png
new file mode 100644
index 000000000..35ad069d9
Binary files /dev/null and b/media/img/icons/circular/menu_icn_preferences.png differ
diff --git a/media/img/icons/circular/menu_icn_preferences_128.png b/media/img/icons/circular/menu_icn_preferences_128.png
new file mode 100644
index 000000000..0ff0a1d48
Binary files /dev/null and b/media/img/icons/circular/menu_icn_preferences_128.png differ
diff --git a/media/img/icons/circular/menu_icn_profile.png b/media/img/icons/circular/menu_icn_profile.png
new file mode 100644
index 000000000..3743b78b0
Binary files /dev/null and b/media/img/icons/circular/menu_icn_profile.png differ
diff --git a/media/img/icons/circular/menu_icn_profile_128.png b/media/img/icons/circular/menu_icn_profile_128.png
new file mode 100644
index 000000000..c34d94970
Binary files /dev/null and b/media/img/icons/circular/menu_icn_profile_128.png differ
diff --git a/media/img/icons/circular/menu_icn_tips.png b/media/img/icons/circular/menu_icn_tips.png
new file mode 100644
index 000000000..ba6362513
Binary files /dev/null and b/media/img/icons/circular/menu_icn_tips.png differ
diff --git a/media/img/icons/circular/menu_icn_tips_128.png b/media/img/icons/circular/menu_icn_tips_128.png
new file mode 100644
index 000000000..7bee3409b
Binary files /dev/null and b/media/img/icons/circular/menu_icn_tips_128.png differ
diff --git a/media/img/icons/circular/menu_icn_train_128.png b/media/img/icons/circular/menu_icn_train_128.png
new file mode 100644
index 000000000..85400746b
Binary files /dev/null and b/media/img/icons/circular/menu_icn_train_128.png differ
diff --git a/media/img/icons/circular/nav_icn_all.png b/media/img/icons/circular/nav_icn_all.png
new file mode 100644
index 000000000..b5c3595b1
Binary files /dev/null and b/media/img/icons/circular/nav_icn_all.png differ
diff --git a/media/img/icons/circular/nav_icn_global.png b/media/img/icons/circular/nav_icn_global.png
new file mode 100644
index 000000000..74a1b9baa
Binary files /dev/null and b/media/img/icons/circular/nav_icn_global.png differ
diff --git a/media/img/icons/circular/nav_icn_site.png b/media/img/icons/circular/nav_icn_site.png
new file mode 100644
index 000000000..1439dc5b5
Binary files /dev/null and b/media/img/icons/circular/nav_icn_site.png differ
diff --git a/media/img/icons/circular/nav_story_orginal.png b/media/img/icons/circular/nav_story_orginal.png
new file mode 100644
index 000000000..6df88c1c0
Binary files /dev/null and b/media/img/icons/circular/nav_story_orginal.png differ
diff --git a/media/img/icons/circular/story_save.png b/media/img/icons/circular/story_save.png
new file mode 100644
index 000000000..3dbcdfd3a
Binary files /dev/null and b/media/img/icons/circular/story_save.png differ
diff --git a/media/img/icons/circular/story_share.png b/media/img/icons/circular/story_share.png
new file mode 100644
index 000000000..17738db3e
Binary files /dev/null and b/media/img/icons/circular/story_share.png differ
diff --git a/media/img/icons/circular/story_share_appnet.png b/media/img/icons/circular/story_share_appnet.png
new file mode 100644
index 000000000..75b424b55
Binary files /dev/null and b/media/img/icons/circular/story_share_appnet.png differ
diff --git a/media/img/icons/circular/story_share_appnet_active.png b/media/img/icons/circular/story_share_appnet_active.png
new file mode 100644
index 000000000..d75b3badd
Binary files /dev/null and b/media/img/icons/circular/story_share_appnet_active.png differ
diff --git a/media/img/icons/circular/story_share_facebook.png b/media/img/icons/circular/story_share_facebook.png
new file mode 100644
index 000000000..ce1cd634d
Binary files /dev/null and b/media/img/icons/circular/story_share_facebook.png differ
diff --git a/media/img/icons/circular/story_share_facebook_active.png b/media/img/icons/circular/story_share_facebook_active.png
new file mode 100644
index 000000000..d6115fb2d
Binary files /dev/null and b/media/img/icons/circular/story_share_facebook_active.png differ
diff --git a/media/img/icons/circular/story_share_twitter.png b/media/img/icons/circular/story_share_twitter.png
new file mode 100644
index 000000000..cae1c35ec
Binary files /dev/null and b/media/img/icons/circular/story_share_twitter.png differ
diff --git a/media/img/icons/circular/story_share_twitter_active.png b/media/img/icons/circular/story_share_twitter_active.png
new file mode 100644
index 000000000..ab29ca364
Binary files /dev/null and b/media/img/icons/circular/story_share_twitter_active.png differ
diff --git a/media/img/icons/circular/widget_left.png b/media/img/icons/circular/widget_left.png
new file mode 100644
index 000000000..f48052d9a
Binary files /dev/null and b/media/img/icons/circular/widget_left.png differ
diff --git a/media/img/icons/circular/widget_left_hover.png b/media/img/icons/circular/widget_left_hover.png
new file mode 100644
index 000000000..667cf0822
Binary files /dev/null and b/media/img/icons/circular/widget_left_hover.png differ
diff --git a/media/img/icons/circular/widget_right.png b/media/img/icons/circular/widget_right.png
new file mode 100644
index 000000000..07c9ae07a
Binary files /dev/null and b/media/img/icons/circular/widget_right.png differ
diff --git a/media/img/icons/circular/widget_right_hover.png b/media/img/icons/circular/widget_right_hover.png
new file mode 100644
index 000000000..c7851eae1
Binary files /dev/null and b/media/img/icons/circular/widget_right_hover.png differ
diff --git a/media/js/newsblur/reader/reader_utils.js b/media/js/newsblur/reader/reader_utils.js
index 1823936a8..51e30351d 100644
--- a/media/js/newsblur/reader/reader_utils.js
+++ b/media/js/newsblur/reader/reader_utils.js
@@ -156,6 +156,7 @@ NEWSBLUR.utils = {
         // Also change in utils/page_importer.py.
         var BROKEN_URLS = [
             'nytimes.com',
+            'github.com',
             'washingtonpost.com',
             'stackoverflow.com',
             'stackexchange.com',