diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => '2f25eb4f',
     'conpherence.pkg.js' => '020aebcf',
-    'core.pkg.css' => 'cf2d74fd',
+    'core.pkg.css' => 'f38d6c52',
     'core.pkg.js' => '2eeda9e0',
     'dark-console.pkg.js' => '187792c2',
     'differential.pkg.css' => '6d3700f0',
@@ -31,7 +31,6 @@
     'rsrc/css/aphront/multi-column.css' => 'fbc00ba3',
     'rsrc/css/aphront/notification.css' => '30240bd2',
     'rsrc/css/aphront/panel-view.css' => '46923d46',
-    'rsrc/css/aphront/phabricator-nav-view.css' => '423f92cc',
     'rsrc/css/aphront/table-view.css' => '0bb61df1',
     'rsrc/css/aphront/tokenizer.css' => '34e2a838',
     'rsrc/css/aphront/tooltip.css' => 'e3f2412f',
@@ -42,7 +41,7 @@
     'rsrc/css/application/base/main-menu-view.css' => '33820efe',
     'rsrc/css/application/base/notification-menu.css' => '4df1ee30',
     'rsrc/css/application/base/phui-theme.css' => '35883b37',
-    'rsrc/css/application/base/standard-page-view.css' => 'e08c7462',
+    'rsrc/css/application/base/standard-page-view.css' => 'fe5811f4',
     'rsrc/css/application/conduit/conduit-api.css' => 'ce2cfc41',
     'rsrc/css/application/config/config-options.css' => '16c920ae',
     'rsrc/css/application/config/config-template.css' => '20babf50',
@@ -138,7 +137,7 @@
     'rsrc/css/phui/phui-action-list.css' => '1b0085b2',
     'rsrc/css/phui/phui-action-panel.css' => '6c386cbf',
     'rsrc/css/phui/phui-badge.css' => '666e25ad',
-    'rsrc/css/phui/phui-basic-nav-view.css' => 'a5693cf0',
+    'rsrc/css/phui/phui-basic-nav-view.css' => 'a2b9148a',
     'rsrc/css/phui/phui-big-info-view.css' => '362ad37b',
     'rsrc/css/phui/phui-box.css' => '5ed3b8cb',
     'rsrc/css/phui/phui-bulk-editor.css' => '374d5e30',
@@ -792,7 +791,6 @@
     'phabricator-keyboard-shortcut' => '1a844c06',
     'phabricator-keyboard-shortcut-manager' => '81debc48',
     'phabricator-main-menu-view' => '33820efe',
-    'phabricator-nav-view-css' => '423f92cc',
     'phabricator-notification' => 'a9b91e3f',
     'phabricator-notification-css' => '30240bd2',
     'phabricator-notification-menu-css' => '4df1ee30',
@@ -805,7 +803,7 @@
     'phabricator-shaped-request' => '995f5102',
     'phabricator-slowvote-css' => '1694baed',
     'phabricator-source-code-view-css' => 'e382316a',
-    'phabricator-standard-page-view' => 'e08c7462',
+    'phabricator-standard-page-view' => 'fe5811f4',
     'phabricator-textareautils' => 'f340a484',
     'phabricator-title' => '43bc9360',
     'phabricator-tooltip' => '83754533',
@@ -823,7 +821,7 @@
     'phriction-document-css' => '03380da0',
     'phui-action-panel-css' => '6c386cbf',
     'phui-badge-view-css' => '666e25ad',
-    'phui-basic-nav-view-css' => 'a5693cf0',
+    'phui-basic-nav-view-css' => 'a2b9148a',
     'phui-big-info-view-css' => '362ad37b',
     'phui-box-css' => '5ed3b8cb',
     'phui-bulk-editor-css' => '374d5e30',
@@ -2258,7 +2256,6 @@
       'phui-lightbox-css',
       'phui-comment-panel-css',
       'phui-header-view-css',
-      'phabricator-nav-view-css',
       'phui-basic-nav-view-css',
       'phui-crumbs-view-css',
       'phui-oi-list-view-css',
diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php
--- a/resources/celerity/packages.php
+++ b/resources/celerity/packages.php
@@ -124,7 +124,6 @@
     'phui-lightbox-css',
     'phui-comment-panel-css',
     'phui-header-view-css',
-    'phabricator-nav-view-css',
     'phui-basic-nav-view-css',
     'phui-crumbs-view-css',
     'phui-oi-list-view-css',
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -17,7 +17,6 @@
  */
 final class AphrontSideNavFilterView extends AphrontView {
 
-  private $items = array();
   private $baseURI;
   private $selectedFilter = false;
   private $menu;
@@ -199,23 +198,16 @@
   }
 
   private function renderFlexNav() {
-    require_celerity_resource('phabricator-nav-view-css');
-
     $nav_classes = array();
     $nav_classes[] = 'phabricator-nav';
 
-    $nav_id = null;
-    $drag_id = null;
     $content_id = celerity_generate_unique_node_id();
     $local_id = null;
-    $background_id = null;
     $local_menu = null;
     $main_id = $this->getMainID();
 
-    $nav_menu = null;
     if ($this->menu->getItems()) {
       $local_id = celerity_generate_unique_node_id();
-      $background_id = celerity_generate_unique_node_id();
 
       $nav_classes[] = 'has-local-nav';
 
diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css
deleted file mode 100644
--- a/webroot/rsrc/css/aphront/phabricator-nav-view.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @provides phabricator-nav-view-css
- */
-
-.device .phui-navigation-shell div.phabricator-nav-local {
-  display: none;
-}
-
-.device-desktop .has-local-nav .phabricator-nav-local {
-  display: block;
-}
-
-.device-phone .phabricator-side-menu-home .phabricator-nav-local {
-  display: block;
-}
-
-/* Home Sidenav */
-.phui-basic-nav.phui-navigation-shell
-  .phabricator-side-menu-home .phabricator-nav-local {
-    padding-top: 16px;
-    padding-right: 0;
-    background-color: transparent;
-    width: 205px;
-    max-width: 205px;
-}
-
-.device-phone .phui-basic-nav.phui-navigation-shell
-  .phabricator-side-menu-home .phabricator-nav-local {
-    padding-top: 0;
-    padding-right: 0;
-    background-color: transparent;
-    width: auto;
-}
-
-
-.phabricator-nav-content {
-  overflow: hidden;
-}
-
-.device-phone .phabricator-side-menu-home .phabricator-nav-content {
-  display: none;
-}
-
-.device-phone .phabricator-side-menu-home .phabricator-nav-local {
-  width: 100%;
-  padding-top: 0;
-  margin-top: 0;
-}
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -45,10 +45,6 @@
   margin-left: 221px;
 }
 
-.device .phabricator-side-menu-home + .phabricator-standard-page-footer {
-  display: none;
-}
-
 .keyboard-shortcut-help {
   margin: 4px 12px;
 }
diff --git a/webroot/rsrc/css/phui/phui-basic-nav-view.css b/webroot/rsrc/css/phui/phui-basic-nav-view.css
--- a/webroot/rsrc/css/phui/phui-basic-nav-view.css
+++ b/webroot/rsrc/css/phui/phui-basic-nav-view.css
@@ -4,21 +4,18 @@
 
 .device-desktop .phui-navigation-shell,
 .phabricator-home.device .phui-navigation-shell {
-  display: table;
   width: 100%;
   height: calc(100vh - {$menu.main.height});
 }
 
 .device-desktop .phui-navigation-shell .phabricator-nav,
 .phabricator-home.device .phui-navigation-shell .phabricator-nav {
-  display: table-row;
+  display: flex;
 }
 
 .device-desktop .phui-navigation-shell .phabricator-nav-local,
 .phabricator-home.device .phui-navigation-shell .phabricator-nav-local {
-  display: table-cell;
   position: relative;
-  vertical-align: top;
   margin-top: 0;
   overflow: hidden;
 }
@@ -35,12 +32,20 @@
 }
 
 .phui-basic-nav.phui-navigation-shell .phabricator-nav-local {
-  width: 205px;
-  max-width: 205px;
+  flex: 0 0 205px;
   padding-top: 12px;
   padding-right: 8px;
 }
 
+.device .phui-navigation-shell .phabricator-nav-local {
+  display: none;
+}
+
+.phabricator-nav-content {
+  flex-grow: 1;
+  overflow: hidden;
+}
+
 .phui-two-column-view .phui-basic-nav.phui-navigation-shell
   .phabricator-nav-local {
     padding-right: 0;