diff --git a/core/modules/user/css/user.icons.theme.css b/core/modules/user/css/user.icons.admin.css
similarity index 100%
rename from core/modules/user/css/user.icons.theme.css
rename to core/modules/user/css/user.icons.admin.css
diff --git a/core/modules/user/user.libraries.yml b/core/modules/user/user.libraries.yml
index e11cbfa..73e4e15 100644
--- a/core/modules/user/user.libraries.yml
+++ b/core/modules/user/user.libraries.yml
@@ -5,8 +5,6 @@ drupal.user:
   css:
     component:
       css/user.module.css: {}
-    theme:
-      css/user.theme.css: {}
   dependencies:
     - core/jquery
     - core/drupal
@@ -33,4 +31,4 @@ drupal.user.icons:
   version: VERSION
   css:
     theme:
-      css/user.icons.theme.css: {}
+      css/user.icons.admin.css: {}
diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml
index af0f891..d47b40f 100644
--- a/core/themes/classy/classy.libraries.yml
+++ b/core/themes/classy/classy.libraries.yml
@@ -27,3 +27,9 @@ search.results:
   css:
     theme:
       css/search/search.theme.css: {}
+
+user:
+  version: VERSION
+  css:
+    theme:
+      css/components/user.css: {}
diff --git a/core/themes/classy/classy.theme b/core/themes/classy/classy.theme
new file mode 100644
index 0000000..3b64a69
--- /dev/null
+++ b/core/themes/classy/classy.theme
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Functions to support theming in the Classy theme.
+ */
+
+/**
+ * Implements hook_library_info_alter().
+ */
+function classy_library_info_alter(&$libraries, $extension) {
+  if ($extension == 'user' && isset($libraries['drupal.user'])) {
+    // @todo Replace with https://www.drupal.org/node/2497667 when possible.
+    $library_discovery = \Drupal::service('library.discovery');
+    $library = $library_discovery->getLibraryByName('classy', 'user');
+    foreach ($library['css'] as $css) {
+      $libraries['drupal.user']['css']['theme'][base_path() . $css['data']] = [];
+    }
+  }
+}
diff --git a/core/modules/user/css/user.theme.css b/core/themes/classy/css/components/user.css
similarity index 100%
rename from core/modules/user/css/user.theme.css
rename to core/themes/classy/css/components/user.css