diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/c-logo.css b/taccsite_cms/static/site_cms/css/src/_imports/components/c-logo.css
index 0b76049dd..994da211d 100644
--- a/taccsite_cms/static/site_cms/css/src/_imports/components/c-logo.css
+++ b/taccsite_cms/static/site_cms/css/src/_imports/components/c-logo.css
@@ -23,5 +23,8 @@ Styleguide Components.Logo
 /* Elements  */
 
 .c-logo__image {
+  /* To delegate height control to base/container */
   height: 100%;
+  /* To prevent length wider than (but allow narrower than) base/container */
+  max-width: 100%;
 }
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-header.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-header.css
index 7d4c789f4..137c74a02 100644
--- a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-header.css
+++ b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-header.css
@@ -80,10 +80,17 @@ Styleguide Trumps.Scopes.Header
 /* Logo */
 
 .s-header .c-logo {
-  /* To align position of first CMS nav link with Portal "Dashboard" header */
-  /* NOTE: Each portal should set this value based on its image width */
-  --offset: 10px;
-  margin-right: var(--offset);
+  /* To allow projects to set this value, but let Core implement it */
+  --width: auto;
+  width: var(--width);
+
+  /* To prevent zero-width element as it is loaded */
+  /* To align position of first CMS nav link with Portal section headers */
+  min-width: 190px; /* CAVEAT: Only works for logos narrow enough to fit */
+
+  /* To allow projects to set this value, but let Core implement it */
+  --space-after-logo-before-nav: 0;
+  margin-right: var(--space-after-logo-before-nav); /* overwrites Bootstrap */
 
   /* FAQ: In case image does not load and browser shows alt text */
   color: env(--header-text-color);
diff --git a/taccsite_custom b/taccsite_custom
index 8a6429874..64a5d035a 160000
--- a/taccsite_custom
+++ b/taccsite_custom
@@ -1 +1 @@
-Subproject commit 8a642987401ed01b4e2bdfcb4b8d8ae3cbde351e
+Subproject commit 64a5d035a88d81a5cc2265e207c1c113c02697d6