diff --git a/dashboard-ui/css/images/items/folders/edit.png b/dashboard-ui/css/images/items/folders/edit.png
deleted file mode 100644
index e48e0e1d1c..0000000000
Binary files a/dashboard-ui/css/images/items/folders/edit.png and /dev/null differ
diff --git a/dashboard-ui/css/images/items/folders/report.png b/dashboard-ui/css/images/items/folders/report.png
deleted file mode 100644
index 441b7fd5cb..0000000000
Binary files a/dashboard-ui/css/images/items/folders/report.png and /dev/null differ
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 02651ed74d..6cf47ed1fa 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -200,53 +200,13 @@
     padding-left: 60px !important;
 }
 
-.tvshowsViewMenu, .livetvViewMenu {
-    background-image: url(images/items/folders/tv.png);
+.iconViewMenu {
+    padding-left: 13px !important;
 }
 
-.moviesViewMenu, .trailersViewMenu {
-    background-image: url(images/items/folders/movies.png);
-}
-
-.gamesViewMenu {
-    background-image: url(images/items/folders/games.png);
-}
-
-.channelsViewMenu {
-    background-image: url(images/items/folders/channels.png);
-}
-
-.booksViewMenu {
-    background-image: url(images/items/folders/books.png);
-}
-
-.musicvideosViewMenu {
-    background-image: url(images/items/folders/musicvideos.png);
-}
-
-.photosViewMenu {
-    background-image: url(images/items/folders/photos.png);
-}
-
-.homeVideosViewMenu {
-    background-image: url(images/items/folders/homevideos.png);
-}
-
-.generalViewMenu, .boxsetsViewMenu, .playlistsViewMenu, .foldersViewMenu {
-    background-image: url(images/items/folders/folder.png);
-}
-
-.editorViewMenu {
-    background-image: url(images/items/folders/edit.png);
-}
-
-.reportsViewMenu {
-    background-image: url(images/items/folders/report.png);
-}
-
-.homevideosViewMenu {
-    background-image: url(images/items/folders/homevideos.png);
-}
+    .iconViewMenu span {
+        margin-right: 11px !important;
+    }
 
 .viewMenuSecondary {
     position: absolute;
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index c78b3b9ede..3057972375 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -78,9 +78,9 @@
 
         html += '<div class="adminMenuOptions">';
         html += '<div class="libraryMenuDivider"></div>';
-        //html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder dashboardViewMenu" data-itemid="dashboard" href="dashboard.html">'+Globalize.translate('ButtonDashboard')+'</a>';
-        html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html">' + Globalize.translate('ButtonMetadataManager') + '</a>';
-        html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder reportsViewMenu" data-itemid="reports" href="reports.html">' + Globalize.translate('ButtonReports') + '</a>';
+
+        html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder editorViewMenu iconViewMenu" data-itemid="editor" href="edititemmetadata.html"><span class="fa fa-edit"></span>' + Globalize.translate('ButtonMetadataManager') + '</a>';
+        html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder reportsViewMenu iconViewMenu" data-itemid="reports" href="reports.html"><span class="fa fa-bar-chart"></span>' + Globalize.translate('ButtonReports') + '</a>';
         html += '</div>';
 
         return html;
@@ -131,7 +131,7 @@
 
             var html = items.map(function (i) {
 
-                var viewMenuCssClass = (i.CollectionType || 'general') + 'ViewMenu';
+                var iconCssClass = 'fa';
 
                 var itemId = i.Id;
 
@@ -143,10 +143,37 @@
                 }
 
                 if (i.Type == 'Channel') {
-                    viewMenuCssClass = 'channelsViewMenu';
                 }
 
-                return '<a data-itemid="' + itemId + '" class="lnkMediaFolder viewMenuLink viewMenuTextLink ' + viewMenuCssClass + '" href="' + getItemHref(i, i.CollectionType) + '">' + i.Name + '</a>';
+                if (i.CollectionType == "photos") {
+                    iconCssClass += ' fa-photo';
+                }
+                else if (i.CollectionType == "music" || i.CollectionType == "musicvideos") {
+                    iconCssClass += ' fa-music';
+                }
+                else if (i.CollectionType == "books") {
+                    iconCssClass += ' fa-book';
+                }
+                else if (i.CollectionType == "playlists") {
+                    iconCssClass += ' fa-list';
+                }
+                else if (i.CollectionType == "games") {
+                    iconCssClass += ' fa-gamepad';
+                }
+                else if (i.CollectionType == "movies") {
+                    iconCssClass += ' fa-film';
+                }
+                else if (i.CollectionType == "channels" || i.Type == 'Channel') {
+                    iconCssClass += ' fa-globe';
+                }
+                else if (i.CollectionType == "tvshows" || i.CollectionType == "livetv") {
+                    iconCssClass += ' fa-video-camera';
+                }
+                else {
+                    iconCssClass += ' fa-folder-open-o';
+                }
+
+                return '<a data-itemid="' + itemId + '" class="lnkMediaFolder viewMenuLink viewMenuTextLink iconViewMenu" href="' + getItemHref(i, i.CollectionType) + '"><span class="' + iconCssClass + '"></span><span class="sectionName">' + i.Name + '</span></a>';
 
             }).join('');
 
@@ -154,7 +181,10 @@
 
             $('.viewMenuTextLink', elem).on('click', function () {
 
-                $('.libraryMenuButtonText').html(this.innerHTML);
+                var section = $('.sectionName', this)[0];
+                var text = section ? section.innerHTML : this.innerHTML;
+
+                $('.libraryMenuButtonText').html(text);
 
             });
         });
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 02d5191cdf..d21c44c5c5 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -8,18 +8,23 @@
 
         <div data-role="content">
 
-            <div class="ui-corner-all ui-shadow wizardContent">
+            <div class="ui-corner-all ui-shadow wizardContent" style="position:relative;">
                 <form class="wizardStartForm">
-                    <h2>
-                        <img src="css/images/mblogoicon.png" />${WelcomeToMediaBrowser}</h2>
 
+                    <div>
+                        <h2 style="float:left;">
+                            <img src="css/images/mblogoicon.png" />${WelcomeToMediaBrowser}
+                        </h2>
+                        <a class="accentButton accentButton-g" href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" style="float:right;margin-top:20px;"><i class="fa fa-info"></i>${ButtonQuickStartGuide}</a>
+                    </div>
+
+                    <br style="clear:both;" />
                     <p>${ThisWizardWillGuideYou}</p>
 
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <label for="selectLocalizationLanguage">${LabelPreferredDisplayLanguage}</label>
-                            <select id="selectLocalizationLanguage" data-mini="true">
-                            </select>
+                            <select id="selectLocalizationLanguage" data-mini="true"></select>
                         </li>
                     </ul>