diff --git a/modules/user/user-rtl.css b/modules/user/user-rtl.css
deleted file mode 100644
index 642c943..0000000
--- a/modules/user/user-rtl.css
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#permissions td.permission {
-  padding-left: 0;
-  padding-right: 1.5em;
-}
-
-#user-admin-roles .form-item-name {
-  float: right;
-  margin-left: 1em;
-  margin-right: 0;
-}
-
-/**
- * Password strength indicator.
- */
-.password-strength {
-  float: left;
-}
-.password-strength-text {
-  float: left;
-}
-div.password-confirm {
-  float: left;
-}
-.confirm-parent,
-.password-parent {
-  clear: right;
-}
-
-/* Generated by user.module but used by profile.module: */
-.profile .user-picture {
-  float: left;
-  margin: 0 0 1em 1em;
-}
diff --git a/modules/user/user.admin-rtl.css b/modules/user/user.admin-rtl.css
new file mode 100644
index 0000000..91490e2
--- /dev/null
+++ b/modules/user/user.admin-rtl.css
@@ -0,0 +1,11 @@
+#permissions td.permission {
+  padding-left: 0;
+  padding-right: 1.5em;
+}
+
+#user-admin-roles .form-item-name {
+  float: right;
+  margin-left: 1em;
+  margin-right: 0;
+}
+
diff --git a/modules/user/user.admin.css b/modules/user/user.admin.css
new file mode 100644
index 0000000..f9db2d8
--- /dev/null
+++ b/modules/user/user.admin.css
@@ -0,0 +1,28 @@
+#permissions td.module {
+  font-weight: bold;
+}
+#permissions td.permission {
+  padding-left: 1.5em; /* LTR */
+}
+#permissions tr.odd .form-item,
+#permissions tr.even .form-item {
+  white-space: normal;
+}
+#user-admin-settings fieldset .fieldset-description {
+  font-size: 0.85em;
+  padding-bottom: .5em;
+}
+
+/**
+ * Override default textfield float to put the "Add role" button next to
+ * the input textfield.
+ */
+#user-admin-roles td.edit-name {
+  clear: both;
+}
+#user-admin-roles .form-item-name {
+  float: left; /* LTR */
+  margin-right: 1em; /* LTR */
+}
+
+
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 4789e7e..65a7b22 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -40,6 +40,10 @@ function user_filter_form() {
     '#type' => 'fieldset',
     '#title' => t('Show only users where'),
     '#theme' => 'exposed_filters__user',
+    '#attached' => array(
+      'css' => array(drupal_get_path('module', 'user') . '/user.admin.css'),
+    ),
+
   );
   foreach ($session as $filter) {
     list($type, $value) = $filter;
diff --git a/modules/user/user.base-rtl.css b/modules/user/user.base-rtl.css
new file mode 100644
index 0000000..5ba6190
--- /dev/null
+++ b/modules/user/user.base-rtl.css
@@ -0,0 +1,16 @@
+/**
+ * Password strength indicator.
+ */
+.password-strength {
+  float: left;
+}
+.password-strength-text {
+  float: left;
+}
+div.password-confirm {
+  float: left;
+}
+.confirm-parent,
+.password-parent {
+  clear: right;
+}
diff --git a/modules/user/user.base.css b/modules/user/user.base.css
new file mode 100644
index 0000000..0006b75
--- /dev/null
+++ b/modules/user/user.base.css
@@ -0,0 +1,22 @@
+/**
+ * Password strength indicator.
+ */
+.password-strength {
+  float: right;  /* LTR */
+}
+.password-strength-title {
+  display: inline;
+}
+.password-strength-text {
+  float: right; /* LTR */
+}
+div.password-confirm {
+  float: right;  /* LTR */
+  visibility: hidden;
+}
+.confirm-parent,
+.password-parent {
+  clear: left; /* LTR */
+  margin: 0;
+  width: 36.3em;
+}
diff --git a/modules/user/user.css b/modules/user/user.css
deleted file mode 100644
index a303307..0000000
--- a/modules/user/user.css
+++ /dev/null
@@ -1,102 +0,0 @@
-
-#permissions td.module {
-  font-weight: bold;
-}
-#permissions td.permission {
-  padding-left: 1.5em; /* LTR */
-}
-#permissions tr.odd .form-item,
-#permissions tr.even .form-item {
-  white-space: normal;
-}
-#user-admin-settings fieldset .fieldset-description {
-  font-size: 0.85em;
-  padding-bottom: .5em;
-}
-
-/**
- * Override default textfield float to put the "Add role" button next to
- * the input textfield.
- */
-#user-admin-roles td.edit-name {
-  clear: both;
-}
-#user-admin-roles .form-item-name {
-  float: left; /* LTR */
-  margin-right: 1em; /* LTR */
-}
-
-/**
- * Password strength indicator.
- */
-.password-strength {
-  width: 17em;
-  float: right;  /* LTR */
-  margin-top: 1.4em;
-}
-.password-strength-title {
-  display: inline;
-}
-.password-strength-text {
-  float: right; /* LTR */
-  font-weight: bold;
-}
-.password-indicator {
-  background-color: #C4C4C4;
-  height: 0.3em;
-  width: 100%;
-}
-.password-indicator div {
-  height: 100%;
-  width: 0%;
-  background-color: #47C965;
-}
-input.password-confirm,
-input.password-field {
-  width: 16em;
-  margin-bottom: 0.4em;
-}
-div.password-confirm {
-  float: right;  /* LTR */
-  margin-top: 1.5em;
-  visibility: hidden;
-  width: 17em;
-}
-div.form-item div.password-suggestions {
-  padding: 0.2em 0.5em;
-  margin: 0.7em 0;
-  width: 38.5em;
-  border: 1px solid #B4B4B4;
-}
-div.password-suggestions ul {
-  margin-bottom: 0;
-}
-.confirm-parent,
-.password-parent {
-  clear: left; /* LTR */
-  margin: 0;
-  width: 36.3em;
-}
-
-/* Generated by user.module but used by profile.module: */
-.profile {
-  clear: both;
-  margin: 1em 0;
-}
-.profile .user-picture {
-  float: right; /* LTR */
-  margin: 0 1em 1em 0; /* LTR */
-}
-.profile h2 {
-  border-bottom: 1px solid #ccc;
-}
-.profile dl {
-  margin: 0 0 1.5em 0;
-}
-.profile dt {
-  margin: 0 0 0.2em 0;
-  font-weight: bold;
-}
-.profile dd {
-  margin: 0 0 1em 0;
-}
diff --git a/modules/user/user.info b/modules/user/user.info
index d887352..e159a25 100644
--- a/modules/user/user.info
+++ b/modules/user/user.info
@@ -7,4 +7,5 @@ files[] = user.entity.inc
 files[] = user.test
 required = TRUE
 configure = admin/config/people
-stylesheets[all][] = user.css
+stylesheets[all][] = user.theme.css
+stylesheets[all][] = user.base.css
diff --git a/modules/user/user.theme-rtl.css b/modules/user/user.theme-rtl.css
new file mode 100644
index 0000000..58820dd
--- /dev/null
+++ b/modules/user/user.theme-rtl.css
@@ -0,0 +1,7 @@
+/**
+ * User profile page e.g. /user/1.
+ */
+.profile .user-picture {
+  float: left;
+  margin: 0 0 1em 1em;
+}
diff --git a/modules/user/user.theme.css b/modules/user/user.theme.css
new file mode 100644
index 0000000..7c16cde
--- /dev/null
+++ b/modules/user/user.theme.css
@@ -0,0 +1,64 @@
+/**
+ * Password strength indicator.
+ */
+.password-strength {
+  width: 17em;
+  margin-top: 1.5em;  
+}
+.password-strength-text {
+  font-weight: bold;
+}
+.password-indicator {
+  background-color: #C4C4C4;
+  height: 0.3em;
+  width: 100%;
+}
+.password-indicator div {
+  height: 100%;
+  width: 0%;
+  background-color: #47C965;
+}
+input.password-confirm,
+input.password-field {
+  width: 16em;
+  margin-bottom: 0.4em;
+}
+div.password-confirm {
+  float: right;  /* LTR */
+  margin-top: 1.5em;
+  visibility: hidden;
+  width: 17em;
+}
+.form-item div.password-suggestions {
+  padding: 0.2em 0.5em;
+  margin: 0.7em 0;
+  width: 38.5em;
+  border: 1px solid #B4B4B4;
+}
+.password-suggestions ul {
+  margin-bottom: 0;
+}
+.confirm-parent,
+.password-parent {
+  clear: left; /* LTR */
+  margin: 0;
+  width: 36.3em;
+}
+
+/**
+ * User profile page e.g. /user/1.
+ */
+.profile .user-picture {
+  float: right; /* LTR */
+  margin: 0 1em 1em 0; /* LTR */
+}
+.profile dl {
+  margin: 0 0 1.5em 0;
+}
+.profile dt {
+  margin: 0 0 0.2em 0;
+  font-weight: bold;
+}
+.profile dd {
+  margin: 0 0 1em 0;
+}
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 4fb8210..468bf79 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -1083,6 +1083,54 @@ div.password-confirm {
   width: 20.73em;
 }
 
+.password-strength {
+  width: 17em;
+}
+.password-strength-text {
+  font-weight: bold;
+}
+.password-indicator {
+  background-color: #C4C4C4;
+  height: 0.3em;
+  width: 100%;
+}
+.password-indicator div {
+  height: 100%;
+  width: 0%;
+  background-color: #47C965;
+}
+input.password-confirm,
+input.password-field {
+  width: 16em;
+  margin-bottom: 0.4em;
+}
+div.password-confirm {
+  float: right;  /* LTR */
+  margin-top: 1.5em;
+  visibility: hidden;
+}
+div.form-item div.password-suggestions {
+  padding: 0.2em 0.5em;
+  margin: 0.7em 0;
+  width: 38.5em;
+  border: 1px solid #B4B4B4;
+}
+div.password-suggestions ul {
+  margin-bottom: 0;
+}
+.confirm-parent,
+.password-parent {
+  clear: left; /* LTR */
+  margin: 0;
+  width: 36.3em;
+}
+
+
+
+
+
+
+
 /* ---------------- Buttons    ---------------- */
 
 input.form-submit,