diff --git a/app/assets/stylesheets/sidenav.css.scss b/app/assets/stylesheets/sidenav.css.scss
index 17e4e488..700cf7ca 100644
--- a/app/assets/stylesheets/sidenav.css.scss
+++ b/app/assets/stylesheets/sidenav.css.scss
@@ -16,6 +16,10 @@
     text-transform: uppercase;
     height: 64px;
     line-height: 64px;
+
+    .material-icons.left {
+      margin-top: 8px;
+    }
   }
 
   .collapsible .collapsible-header .chevron {
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 0dcfee57..dadede02 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -34,11 +34,6 @@
               <i class="material-icons">menu</i>
             </a>
           </li>
-          <% if current_user && (current_user.universes.count > 0 || current_user.contributable_universes.count > 0) %>
-            <li>
-              <%= render partial: 'universes/picker' %>
-            </li>
-          <% end %>
         <% end %>
       </ul>
     </div>
diff --git a/app/views/layouts/_sidenav.html.erb b/app/views/layouts/_sidenav.html.erb
index 567e201a..20f06283 100644
--- a/app/views/layouts/_sidenav.html.erb
+++ b/app/views/layouts/_sidenav.html.erb
@@ -6,6 +6,35 @@
   </li>
   <li class="no-padding">
     <ul class="collapsible collapsible-accordion">
+      <li class="bold waves-effect">
+        <a class="collapsible-header" tabindex="0">
+          <i class="material-icons chevron <%= Universe.color %>-text"><%= Universe.icon %></i>
+          <%= @universe_scope.present? ? @universe_scope.name : 'Working universe' %>
+        </a>
+        <div class="collapsible-body">
+          <ul>
+            <li>
+              <%= link_to "?universe=all", class: 'waves-effect' do %>
+                <i class="material-icons purple-text">
+                  <%= Universe.icon %>
+                </i>
+                All Universes
+              <% end %>
+            </li>
+            <li class="divider"></li>
+            <% ((@current_user_content['Universe'] || []) + current_user.contributable_universes).sort_by(&:name).each do |universe| %>
+              <li>
+                <%= link_to "?universe=#{universe.id}", class: 'waves-effect' do %>
+                  <i class="material-icons purple-text">
+                    <%= Universe.icon %>
+                  </i>
+                  <%= truncate universe.name + (universe.user_id == current_user.id ? '' : ' (contributor)') %>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      </li>
       <li class="bold waves-effect active">
         <a class="collapsible-header" tabindex="0">
           Navigation