diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/about.html b/common/test/test_microsites/test_microsite/templates/static_templates/about.html
index a326281b6d..53148823ae 100644
--- a/common/test/test_microsites/test_microsite/templates/static_templates/about.html
+++ b/common/test/test_microsites/test_microsite/templates/static_templates/about.html
@@ -17,7 +17,7 @@
   <section class="vision">
     ## <div class="our-mission">
     ##   <div class="logo">
-    ##     <img src="${static.url('images/edx-logo-large-bw.png')}">
+    ##     <img src="${static.url('images/edx-theme/edx-logo-bw.png')}">
     ##   </div>
     ##   <h2 class="mission-quote">&ldquo;${_('The mission of <span class="edx">{edX}</span> is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.').format(edX="edX")}&rdquo;</h2>
     ## </div>
diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py
index a9d5742bb2..23735823bf 100644
--- a/lms/djangoapps/branding/__init__.py
+++ b/lms/djangoapps/branding/__init__.py
@@ -64,7 +64,7 @@ def get_logo_url():
     university = microsite.get_value('university')
 
     if university is None and settings.FEATURES.get('IS_EDX_DOMAIN', False):
-        return '{static_url}images/edx-logo-77x36.png'.format(
+        return '{static_url}images/edx-theme/edx-logo-77x36.png'.format(
             static_url=settings.STATIC_URL
         )
     elif university:
diff --git a/lms/static/images/edx-logo-large-bw.png b/lms/static/images/edx-logo-large-bw.png
deleted file mode 100644
index d888e1f4bb..0000000000
Binary files a/lms/static/images/edx-logo-large-bw.png and /dev/null differ
diff --git a/lms/static/images/edx-background-banner-account.png b/lms/static/images/edx-theme/edx-background-banner-account.png
similarity index 100%
rename from lms/static/images/edx-background-banner-account.png
rename to lms/static/images/edx-theme/edx-background-banner-account.png
diff --git a/lms/static/images/edx-edge-logo-large.png b/lms/static/images/edx-theme/edx-edge-logo-large.png
similarity index 100%
rename from lms/static/images/edx-edge-logo-large.png
rename to lms/static/images/edx-theme/edx-edge-logo-large.png
diff --git a/lms/static/images/edx-header-logo.png b/lms/static/images/edx-theme/edx-header-logo.png
similarity index 100%
rename from lms/static/images/edx-header-logo.png
rename to lms/static/images/edx-theme/edx-header-logo.png
diff --git a/lms/static/images/edx-logo-77x36.png b/lms/static/images/edx-theme/edx-logo-77x36.png
similarity index 100%
rename from lms/static/images/edx-logo-77x36.png
rename to lms/static/images/edx-theme/edx-logo-77x36.png
diff --git a/lms/static/images/edx-logo-bw.png b/lms/static/images/edx-theme/edx-logo-bw.png
similarity index 100%
rename from lms/static/images/edx-logo-bw.png
rename to lms/static/images/edx-theme/edx-logo-bw.png
diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss
index 5de045cf37..025591b4e6 100644
--- a/lms/static/sass/base/_variables.scss
+++ b/lms/static/sass/base/_variables.scss
@@ -411,9 +411,9 @@ $homepage__header--background: lighten($gray, 15%);
 // IMAGES: backgrounds
 $homepage-bg-image: none;
 
-$login-banner-image: url(../images/edx-background-banner-account.png);
-$register-banner-image: url(../images/edx-background-banner-account.png);
-$passwordreset-banner-image: url(../images/edx-background-banner-account.png);
+$login-banner-image: url(../images/edx-theme/edx-background-banner-account.png);
+$register-banner-image: url(../images/edx-theme/edx-background-banner-account.png);
+$passwordreset-banner-image: url(../images/edx-theme/edx-background-banner-account.png);
 
 $video-thumb-url: '../images/homepage-hero-video-thumb.jpg';
 
diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss
index 150a2738f3..996825c7fd 100644
--- a/lms/static/sass/multicourse/_edge.scss
+++ b/lms/static/sass/multicourse/_edge.scss
@@ -175,7 +175,7 @@ $paleYellow: #fffcf1;
     width: 263px;
     height: 72px;
     margin: 150px auto 50px;
-    background: url(../images/edx-edge-logo-large.png) no-repeat;
+    background: url(../images/edx-theme/edx-edge-logo-large.png) no-repeat;
     text-indent: -9999px;
     overflow: hidden;
   }
diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html
index 5f8a0c80fe..700e27e561 100644
--- a/lms/templates/courseware/courses.html
+++ b/lms/templates/courseware/courses.html
@@ -19,8 +19,8 @@
     course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore courses from {platform_name}.").format(platform_name=platform_name))
 
     if settings.FEATURES.get('IS_EDX_DOMAIN', False):
-      # For some reason, `static.url('images/edx-logo-bw.png')` breaks template rendering.
-      default_image_url = settings.STATIC_URL + 'images/edx-logo-bw.png'
+      # For some reason, `static.url('images/edx-theme/edx-logo-bw.png')` breaks template rendering.
+      default_image_url = settings.STATIC_URL + 'images/edx-theme/edx-logo-bw.png'
     else:
       default_image_url = settings.STATIC_URL + 'images/logo-placeholder-large.png'
 
diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html
index ade89a574d..40ca1b8055 100644
--- a/lms/templates/footer-edx-new.html
+++ b/lms/templates/footer-edx-new.html
@@ -11,7 +11,7 @@
       <h2 class="sr footer-about-title">${_("About edX")}</h2>
 
       <div class="footer-about-logo">
-        <img alt="edX logo" src="${static.url('images/edx-header-logo.png')}">
+        <img alt="edX logo" src="${static.url('images/edx-theme/edx-header-logo.png')}">
       </div>
 
       <div class="footer-about-copy">