diff --git a/x-pack/plugins/security/public/components/_index.scss b/x-pack/plugins/security/public/components/_index.scss
new file mode 100644
index 0000000000000..707dc73de00f2
--- /dev/null
+++ b/x-pack/plugins/security/public/components/_index.scss
@@ -0,0 +1 @@
+@import './management/users/index';
diff --git a/x-pack/plugins/security/public/components/management/users/_index.scss b/x-pack/plugins/security/public/components/management/users/_index.scss
new file mode 100644
index 0000000000000..c5da74aa3f785
--- /dev/null
+++ b/x-pack/plugins/security/public/components/management/users/_index.scss
@@ -0,0 +1 @@
+@import './users';
diff --git a/x-pack/plugins/security/public/components/management/users/_users.scss b/x-pack/plugins/security/public/components/management/users/_users.scss
new file mode 100644
index 0000000000000..d06ec3dd526f1
--- /dev/null
+++ b/x-pack/plugins/security/public/components/management/users/_users.scss
@@ -0,0 +1,16 @@
+// HACK -- Fix for background color full-height of browser
+.secUsersEditPage,
+.secUsersListingPage {
+  min-height: calc(100vh - 70px);
+}
+
+.secUsersListingPage__content {
+  flex-grow: 0;
+}
+
+.secUsersEditPage__content {
+  max-width: $secFormWidth;
+  margin-left: auto;
+  margin-right: auto;
+  flex-grow: 0;
+}
diff --git a/x-pack/plugins/security/public/components/management/users/edit_user.js b/x-pack/plugins/security/public/components/management/users/edit_user.js
index fcd65c5968dfb..a2266dbcf2752 100644
--- a/x-pack/plugins/security/public/components/management/users/edit_user.js
+++ b/x-pack/plugins/security/public/components/management/users/edit_user.js
@@ -386,9 +386,9 @@ class EditUserUI extends Component {
     }
 
     return (
-      <EuiPage className="mgtUsersEditPage">
+      <EuiPage className="secUsersEditPage">
         <EuiPageBody>
-          <EuiPageContent className="mgtUsersEditPage__content">
+          <EuiPageContent className="secUsersEditPage__content">
             <EuiPageContentHeader>
               <EuiPageContentHeaderSection>
                 <EuiTitle>
diff --git a/x-pack/plugins/security/public/components/management/users/users.js b/x-pack/plugins/security/public/components/management/users/users.js
index da2617c48b30a..49babb461c6c5 100644
--- a/x-pack/plugins/security/public/components/management/users/users.js
+++ b/x-pack/plugins/security/public/components/management/users/users.js
@@ -93,7 +93,7 @@ class UsersUI extends Component {
     const { apiClient, intl } = this.props;
     if (permissionDenied) {
       return (
-        <EuiPage className="mgtUsersListingPage">
+        <EuiPage className="secUsersListingPage">
           <EuiPageBody>
             <EuiPageContent horizontalPosition="center">
               <EuiEmptyPrompt
@@ -222,9 +222,9 @@ class UsersUI extends Component {
         return normalized.indexOf(normalizedQuery) !== -1;
       }) : users;
     return (
-      <EuiPage className="mgtUsersListingPage">
+      <EuiPage className="secUsersListingPage">
         <EuiPageBody>
-          <EuiPageContent className="mgtUsersListingPage__content">
+          <EuiPageContent className="secUsersListingPage__content">
             <EuiPageContentHeader>
               <EuiPageContentHeaderSection>
                 <EuiTitle>
diff --git a/x-pack/plugins/security/public/index.scss b/x-pack/plugins/security/public/index.scss
index 97e6b9fed728c..c38245720acf5 100644
--- a/x-pack/plugins/security/public/index.scss
+++ b/x-pack/plugins/security/public/index.scss
@@ -1,10 +1,17 @@
 @import 'ui/public/styles/styling_constants';
 
-// Logged out styles
-@import './views/logged_out/index';
+// Prefix all styles with "kbn" to avoid conflicts.
+// Examples
+//   secChart
+//   secChart__legend
+//   secChart__legend--small
+//   secChart__legend-isLoading
 
-// Login styles
-@import './views/login/index';
+$secFormWidth: 460px;
+
+// Public components
+@import './components/index';
+
+// Public views
+@import './views/index';
 
-// Management styles
-@import './views/management/index';
diff --git a/x-pack/plugins/security/public/views/_index.scss b/x-pack/plugins/security/public/views/_index.scss
new file mode 100644
index 0000000000000..fa95d44f637e4
--- /dev/null
+++ b/x-pack/plugins/security/public/views/_index.scss
@@ -0,0 +1,8 @@
+// Public views
+@import './logged_out/index';
+
+// Login styles
+@import './login/index';
+
+// Management styles
+@import './management/index';
diff --git a/x-pack/plugins/security/public/views/management/_index.scss b/x-pack/plugins/security/public/views/management/_index.scss
new file mode 100644
index 0000000000000..d1064f5895739
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/_index.scss
@@ -0,0 +1,2 @@
+@import './change_password_form/index';
+@import './edit_role/index';
diff --git a/x-pack/plugins/security/public/views/management/change_password_form/_change_password_form.scss b/x-pack/plugins/security/public/views/management/change_password_form/_change_password_form.scss
new file mode 100644
index 0000000000000..98331c2070a31
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/change_password_form/_change_password_form.scss
@@ -0,0 +1,17 @@
+.secChangePasswordForm__panel {
+  max-width: $secFormWidth;
+}
+
+.secChangePasswordForm__subLabel {
+  margin-bottom: $euiSizeS;
+}
+
+.secChangePasswordForm__footer {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  .kuiButton + .kuiButton {
+    margin-left: $euiSizeS;
+  }
+}
diff --git a/x-pack/plugins/security/public/views/management/change_password_form/_index.scss b/x-pack/plugins/security/public/views/management/change_password_form/_index.scss
new file mode 100644
index 0000000000000..a6058b5ddebbf
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/change_password_form/_index.scss
@@ -0,0 +1 @@
+@import './change_password_form';
diff --git a/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html b/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
index b35bc0c6aedbc..c481b1f2a8672 100644
--- a/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
+++ b/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
@@ -21,13 +21,13 @@
     <!-- Changing password -->
     <div
       ng-show="changePasswordController.isFormVisible"
-      class="kuiFormPanel mgtForm__panel"
+      class="kuiFormPanel secChangePasswordForm__panel"
     >
       <!-- Current password -->
       <div class="kuiFormSection" ng-if="requireCurrentPassword">
         <label
           for="password"
-          class="kuiFormSubLabel mgtForm__subLabel"
+          class="kuiFormSubLabel secChangePasswordForm__subLabel"
           i18n-id="xpack.security.management.changePasswordForm.currentPasswordLabel"
           i18n-default-message="Current password"
         ></label>
@@ -54,7 +54,7 @@
       <div class="kuiFormSection">
         <label
           for="newPassword"
-          class="kuiFormSubLabel mgtForm__subLabel"
+          class="kuiFormSubLabel secChangePasswordForm__subLabel"
           i18n-id="xpack.security.management.changePasswordForm.newPasswordLabel"
           i18n-default-message="New password"
         ></label>
@@ -82,9 +82,9 @@
       <div class="kuiFormSection">
         <label
           for="confirmPassword"
-          class="kuiFormSubLabel mgtForm__subLabel"
+          class="kuiFormSubLabel secChangePasswordForm__subLabel"
           i18n-id="xpack.security.management.changePasswordForm.confirmPasswordLabel"
-          i18n-default-message="Confirm password"  
+          i18n-default-message="Confirm password"
         ></label>
         <input
           type="password"
@@ -112,12 +112,12 @@
           <span
             i18n-id="xpack.security.management.changePasswordForm.updateAndRestartKibanaDescription"
             i18n-default-message="After you change the password for the kibana user, you must update the kibana.yml file and restart Kibana"
-          ></span>          
+          ></span>
         </div>
       </div>
 
       <!-- Form actions -->
-      <div class="kuiFormFooter mgtForm__footer">
+      <div class="kuiFormFooter secChangePasswordForm__footer">
         <button
           type="button"
           data-test-subj="saveChangesButton"
diff --git a/x-pack/plugins/security/public/views/management/edit_role/_index.scss b/x-pack/plugins/security/public/views/management/edit_role/_index.scss
new file mode 100644
index 0000000000000..192091fb04e3c
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/edit_role/_index.scss
@@ -0,0 +1 @@
+@import './components/index';
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/_index.scss b/x-pack/plugins/security/public/views/management/edit_role/components/_index.scss
new file mode 100644
index 0000000000000..678d9a64bf16a
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/_index.scss
@@ -0,0 +1,7 @@
+@import './collapsible_panel/collapsible_panel';
+@import './privileges/kibana/space_aware_privilege_section/index';
+
+.secPrivilegeFeatureIcon {
+  flex-shrink: 0;
+  margin-right: $euiSizeS;
+}
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/es/elasticsearch_privileges.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/es/elasticsearch_privileges.tsx
index 8da378ade28f6..977eff56404ee 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/es/elasticsearch_privileges.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/es/elasticsearch_privileges.tsx
@@ -169,7 +169,7 @@ class ElasticsearchPrivilegesUI extends Component<Props, {}> {
         <EuiHorizontalRule />
 
         {this.props.editable && (
-          <EuiButton size={'s'} iconType={'plusInCircle'} onClick={this.addIndexPrivilege}>
+          <EuiButton iconType={'plusInCircleFilled'} onClick={this.addIndexPrivilege}>
             <FormattedMessage
               id="xpack.security.management.editRoles.elasticSearchPrivileges.addIndexPrivilegesButtonLabel"
               defaultMessage="Add index privilege"
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/feature_table.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/feature_table.tsx
index 7a163b23674b4..fda5f69e1455a 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/feature_table.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/feature_table.tsx
@@ -6,15 +6,14 @@
 
 import {
   EuiIcon,
+  // @ts-ignore
   EuiIconTip,
   // @ts-ignore
   EuiInMemoryTable,
   // @ts-ignore
   EuiSuperSelect,
   EuiText,
-  EuiTextProps,
 } from '@elastic/eui';
-import { EuiIconProps } from '@elastic/eui/src/components/icon/icon';
 import { InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
@@ -74,7 +73,7 @@ export class FeatureTable extends Component<Props, {}> {
       role,
     }));
 
-    return <EuiInMemoryTable columns={this.getColumns()} items={items} />;
+    return <EuiInMemoryTable responsive={false} columns={this.getColumns()} items={items} />;
   }
 
   public onChange = (featureId: string) => (privilege: string) => {
@@ -120,22 +119,23 @@ export class FeatureTable extends Component<Props, {}> {
             </EuiText>
           );
           tooltipElement = (
-            <EuiIconTip type={'iInCircle'} color={'primary'} content={tooltipContent} />
+            <EuiIconTip
+              // TODO: Waiting on update from EUI
+              // iconProps={{
+              //   className: 'eui-alignTop',
+              // }}
+              type={'iInCircle'}
+              color={'subdued'}
+              content={tooltipContent}
+            />
           );
         }
 
-        const textProps: EuiTextProps = {};
-        const iconProps: EuiIconProps = {};
-        if (!feature.hasAnyPrivilegeAssigned) {
-          textProps.color = 'subdued';
-          iconProps.color = 'subdued';
-        }
-
         return (
-          <EuiText {...textProps}>
-            <EuiIcon {...iconProps} type={feature.icon} />
-            &ensp; {feature.name} {tooltipElement}
-          </EuiText>
+          <span>
+            <EuiIcon size="m" type={feature.icon} className="secPrivilegeFeatureIcon" />
+            {feature.name} {tooltipElement}
+          </span>
         );
       },
     },
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/_index.scss b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/_index.scss
new file mode 100644
index 0000000000000..3f40f21e102a1
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/_index.scss
@@ -0,0 +1 @@
+@import './privilege_matrix';
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/_privilege_matrix.scss b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/_privilege_matrix.scss
new file mode 100644
index 0000000000000..2866ef2cf7b72
--- /dev/null
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/_privilege_matrix.scss
@@ -0,0 +1,5 @@
+.secPrivilegeMatrix__row--isBasePrivilege,
+.secPrivilegeMatrix__cell--isGlobalPrivilege,
+.secPrivilegeTable__row--isGlobalSpace, {
+  background-color: $euiColorLightestShade;
+}
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_display.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_display.tsx
index 2e704b06b0f21..41fcecb60ae73 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_display.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_display.tsx
@@ -36,7 +36,7 @@ export const SupercededPrivilegeDisplay: SFC<SupercededProps> = (props: Superced
   return (
     <PrivilegeDisplay
       {...rest}
-      iconType={'questionInCircle'}
+      iconType={'lock'}
       tooltipContent={
         <FormattedMessage
           id="foo"
@@ -62,11 +62,7 @@ function getDisplayValue(privilege: string | string[], styleMissingPrivilege?: b
     privileges.length === 0 || (privileges.length === 1 && privileges.includes(NO_PRIVILEGE_VALUE));
 
   if (isPrivilegeMissing && styleMissingPrivilege) {
-    displayValue = (
-      <EuiText>
-        <EuiIcon size={'s'} type={'minusInCircle'} /> none
-      </EuiText>
-    );
+    displayValue = <EuiIcon color="subdued" type={'minusInCircle'} />;
   } else {
     displayValue = privileges.map(p => _.capitalize(p)).join(', ');
   }
@@ -79,7 +75,17 @@ function getIconTip(iconType?: IconType, tooltipContent?: ReactNode) {
     return null;
   }
 
-  return <EuiIconTip type={iconType} content={tooltipContent} size={'s'} />;
+  return (
+    <EuiIconTip
+      // TODO: Waiting on update from EUI
+      // iconProps={{
+      //   className: 'eui-alignTop',
+      // }}
+      type={iconType}
+      content={tooltipContent}
+      size={'s'}
+    />
+  );
 }
 
 function coerceToArray(privilege: string | string[]): string[] {
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
index 44f4702ce7f11..805f669b20688 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
@@ -5,9 +5,9 @@
  */
 import {
   EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
+  EuiButtonEmpty,
   EuiIcon,
+  EuiIconTip,
   // @ts-ignore
   EuiInMemoryTable,
   EuiModal,
@@ -55,7 +55,7 @@ export class PrivilegeMatrix extends Component<Props, State> {
         <EuiOverlayMask>
           <EuiModal onClose={this.hideModal}>
             <EuiModalHeader>
-              <EuiModalHeaderTitle>Privilege matrix</EuiModalHeaderTitle>
+              <EuiModalHeaderTitle>Privilege summary matrix</EuiModalHeaderTitle>
             </EuiModalHeader>
             <EuiModalBody>{this.renderTable()}</EuiModalBody>
             <EuiModalFooter>
@@ -70,7 +70,7 @@ export class PrivilegeMatrix extends Component<Props, State> {
 
     return (
       <Fragment>
-        <EuiButton onClick={this.showModal}>Show privilege matrix</EuiButton>
+        <EuiButtonEmpty onClick={this.showModal}>Show privilege summary</EuiButtonEmpty>
         {modal}
       </Fragment>
     );
@@ -132,15 +132,26 @@ export class PrivilegeMatrix extends Component<Props, State> {
         field: 'feature',
         name: 'Feature',
         render: (feature: Feature & { isBase: boolean }) => {
-          return (
-            <EuiText
-              style={{
-                fontWeight: feature.isBase ? 'bold' : 'normal',
-              }}
-            >
-              {feature.icon && <EuiIcon type={feature.icon} style={{ marginRight: '10px' }} />}{' '}
+          return feature.isBase ? (
+            <Fragment>
+              <strong>{feature.name}</strong>
+              <EuiIconTip
+                // TODO: Waiting on update from EUI
+                // iconProps={{
+                //   className: 'eui-alignTop',
+                // }}
+                type="questionInCircle"
+                content="Lowest level privilege allowed"
+                color="subdued"
+              />
+            </Fragment>
+          ) : (
+            <Fragment>
+              {feature.icon && (
+                <EuiIcon className="secPrivilegeFeatureIcon" size="m" type={feature.icon} />
+              )}
               {feature.name}
-            </EuiText>
+            </Fragment>
           );
         },
       },
@@ -148,32 +159,35 @@ export class PrivilegeMatrix extends Component<Props, State> {
         return {
           field: 'feature',
           name: (
-            <EuiFlexGroup wrap gutterSize={'xs'}>
-              <Fragment>
-                {item.headerSpaces.map((space: Space) => (
-                  <EuiFlexItem grow={false} key={space.id}>
-                    <EuiText>
-                      <SpaceAvatar space={space} /> {item.isGlobal && space.name}{' '}
+            <Fragment>
+              {item.headerSpaces.map((space: Space) => (
+                <span key={space.id}>
+                  <SpaceAvatar size="s" space={space} />{' '}
+                  {item.isGlobal && (
+                    <span>
+                      Global <br />
+                      (all spaces)
+                    </span>
+                  )}
+                </span>
+              ))}
+              {item.headerSpaces.length !== item.spaces.length && (
+                // @ts-ignore
+                <EuiToolTip
+                  content={
+                    <EuiText size="s">
+                      <ul>
+                        {item.spaces.map((s: Space) => (
+                          <li key={s.id}>{s.name}</li>
+                        ))}
+                      </ul>
                     </EuiText>
-                  </EuiFlexItem>
-                ))}
-                {item.headerSpaces.length !== item.spaces.length && (
-                  <EuiFlexItem grow={false}>
-                    <EuiToolTip
-                      content={
-                        <ul>
-                          {item.spaces.map((s: Space) => (
-                            <li key={s.id}>{s.name}</li>
-                          ))}
-                        </ul>
-                      }
-                    >
-                      <EuiText>({item.spaces.length - item.headerSpaces.length} more)</EuiText>
-                    </EuiToolTip>
-                  </EuiFlexItem>
-                )}
-              </Fragment>
-            </EuiFlexGroup>
+                  }
+                >
+                  {item.spaces.length - item.headerSpaces.length} more
+                </EuiToolTip>
+              )}
+            </Fragment>
           ),
           render: (feature: Feature & { isBase: boolean }, record: TableRow) => {
             if (item.isGlobal) {
@@ -229,7 +243,26 @@ export class PrivilegeMatrix extends Component<Props, State> {
       }),
     ];
 
-    return <EuiInMemoryTable columns={columns} items={rows} />;
+    return (
+      <EuiInMemoryTable
+        columns={columns}
+        items={rows}
+        // TODO: FIX the ts-ignores
+        // @ts-ignore
+        rowProps={item => {
+          return {
+            className: item.feature.isBase ? 'secPrivilegeMatrix__row--isBasePrivilege' : '',
+          };
+        }}
+        // @ts-ignore
+        cellProps={item => {
+          // TODO: FIX THIS TO ACTUALLY WORK
+          return {
+            className: item.isGlobal ? 'secPrivilegeMatrix__cell--isGlobalPrivilege' : '',
+          };
+        }}
+      />
+    );
   };
 
   private locateGlobalPrivilege = () => {
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
index 460ecf90fbfb3..6d4b02c3d9345 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
@@ -17,6 +17,7 @@ import {
   EuiForm,
   EuiFormRow,
   EuiOverlayMask,
+  EuiSpacer,
   // @ts-ignore
   EuiSuperSelect,
   EuiText,
@@ -84,12 +85,12 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
   public render() {
     return (
       <EuiOverlayMask>
-        <EuiFlyout onClose={this.closeFlyout} size="s" maxWidth={true}>
-          <EuiFlyoutHeader>
-            <EuiTitle>
-              <h1>
+        <EuiFlyout onClose={this.closeFlyout} size="m" maxWidth={true}>
+          <EuiFlyoutHeader hasBorder>
+            <EuiTitle size="m">
+              <h2>
                 <FormattedMessage id="foo" defaultMessage="Spaces privileges" />
-              </h1>
+              </h2>
             </EuiTitle>
           </EuiFlyoutHeader>
           <EuiFlyoutBody>{this.getForm()}</EuiFlyoutBody>
@@ -97,12 +98,12 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
             <EuiFlexGroup justifyContent="spaceBetween">
               <EuiFlexItem grow={false}>
                 <EuiButtonEmpty iconType="cross" onClick={this.closeFlyout} flush="left">
-                  Close
+                  Cancel
                 </EuiButtonEmpty>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiButton onClick={this.onSaveClick} fill disabled={!this.canSave()}>
-                  Save
+                  Create space privilege
                 </EuiButton>
               </EuiFlexItem>
             </EuiFlexGroup>
@@ -116,7 +117,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
     const { intl, spaces } = this.props;
     return (
       <EuiForm>
-        <EuiFormRow label={intl.formatMessage({ id: 'foo', defaultMessage: 'Spaces' })}>
+        <EuiFormRow fullWidth label={intl.formatMessage({ id: 'foo', defaultMessage: 'Spaces' })}>
           <SpaceSelector
             selectedSpaceIds={this.state.selectedSpaceIds}
             onChange={this.onSelectedSpacesChange}
@@ -127,14 +128,11 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
         {this.getPrivilegeCallout()}
 
         <EuiFormRow
-          label={intl.formatMessage({ id: 'foo', defaultMessage: 'Base privilege' })}
-          helpText={intl.formatMessage({
-            id: 'foo',
-            defaultMessage:
-              'Default privilege for apps and settings not listed in the table below.',
-          })}
+          fullWidth
+          label={intl.formatMessage({ id: 'foo', defaultMessage: 'Privilege' })}
         >
           <EuiSuperSelect
+            fullWidth
             onChange={this.onSpaceMinimumPrivilegeChange}
             options={[
               {
@@ -143,7 +141,10 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
                 dropdownDisplay: (
                   <EuiText>
                     <strong>Custom</strong>
-                    <p>Customize access to this space</p>
+                    <p>
+                      Customize access by feature. Defaults to none for features not listed in the
+                      table below.
+                    </p>
                   </EuiText>
                 ),
               },
@@ -175,21 +176,31 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
           />
         </EuiFormRow>
 
-        <EuiFormRow
-          label={this.getFeatureListLabel(this.state.selectedMinimumPrivilege.length > 0)}
-        >
-          <FeatureTable
-            role={this.state.role}
-            features={this.props.features}
-            effectivePrivileges={this.props.effectivePrivilegesFactory.getInstance(this.state.role)}
-            intl={this.props.intl}
-            onChange={this.onFeaturePrivilegesChange}
-            privilegeDefinition={this.props.privilegeDefinition}
-            spacesIndex={this.state.editingIndex}
-            showLocks={this.state.selectedMinimumPrivilege.length === 0}
-            disabled={this.state.selectedMinimumPrivilege.length > 0}
-          />
-        </EuiFormRow>
+        <EuiSpacer size="s" />
+
+        <EuiTitle size="xxs">
+          <h3>{this.getFeatureListLabel(this.state.selectedMinimumPrivilege.length > 0)}</h3>
+        </EuiTitle>
+
+        <EuiSpacer size="xs" />
+
+        <EuiText size="s">
+          <p>{this.getFeatureListDescription(this.state.selectedMinimumPrivilege.length > 0)}</p>
+        </EuiText>
+
+        <EuiSpacer size="l" />
+
+        <FeatureTable
+          role={this.state.role}
+          features={this.props.features}
+          effectivePrivileges={this.props.effectivePrivilegesFactory.getInstance(this.state.role)}
+          intl={this.props.intl}
+          onChange={this.onFeaturePrivilegesChange}
+          privilegeDefinition={this.props.privilegeDefinition}
+          spacesIndex={this.state.editingIndex}
+          showLocks={this.state.selectedMinimumPrivilege.length === 0}
+          disabled={this.state.selectedMinimumPrivilege.length > 0}
+        />
       </EuiForm>
     );
   };
@@ -208,10 +219,26 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
     }
   };
 
+  private getFeatureListDescription = (disabled: boolean) => {
+    if (disabled) {
+      return this.props.intl.formatMessage({
+        id: 'foo',
+        defaultMessage:
+          'Showing privilege levels on a per-feature basis. Remember, some of these features may have been turned off by the space itself or affected by a global space privilege.',
+      });
+    } else {
+      return this.props.intl.formatMessage({
+        id: 'foo',
+        defaultMessage:
+          'Increase privilege levels from base privilege on a per-feature basis. Remember, some of these features may have been turned off by the space itself or affected by a global space privilege.',
+      });
+    }
+  };
+
   private getPrivilegeCallout = () => {
     if (this.state.selectedSpaceIds.includes('*')) {
       return (
-        <EuiFormRow>
+        <EuiFormRow fullWidth>
           <EuiCallOut
             color="primary"
             iconType="iInCircle"
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 96ee65db211a5..6e0daca5e1524 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -6,12 +6,9 @@
 import {
   EuiBadge,
   EuiBadgeProps,
-  EuiFlexGroup,
-  EuiFlexItem,
+  EuiButtonEmpty,
   // @ts-ignore
   EuiInMemoryTable,
-  EuiText,
-  EuiToolTip,
 } from '@elastic/eui';
 import _ from 'lodash';
 import React, { Component } from 'react';
@@ -100,30 +97,23 @@ export class PrivilegeSpaceTable extends Component<Props, {}> {
         width: '60%',
         render: (spaces: TableSpace[], record: TableRow) => {
           return (
-            <EuiFlexGroup wrap gutterSize={'s'}>
+            <div>
               {spaces.slice(0, SPACES_DISPLAY_COUNT).map((space: TableSpace) => (
-                <EuiFlexItem grow={false} key={space.id}>
-                  <EuiBadge {...getExtraBadgeProps(space)} color={getSpaceColor(space)}>
-                    {space.name}
-                  </EuiBadge>
-                </EuiFlexItem>
+                <EuiBadge
+                  key={space.id}
+                  {...getExtraBadgeProps(space)}
+                  color={getSpaceColor(space)}
+                >
+                  {space.name}
+                </EuiBadge>
               ))}
               {record.spaces.length > SPACES_DISPLAY_COUNT ? (
-                <EuiFlexItem grow={false}>
-                  <EuiToolTip
-                    content={
-                      <ul>
-                        {record.spaces.map(s => (
-                          <li key={s.id}>{s.name}</li>
-                        ))}
-                      </ul>
-                    }
-                  >
-                    <EuiText>({spaces.length - SPACES_DISPLAY_COUNT} more)</EuiText>
-                  </EuiToolTip>
-                </EuiFlexItem>
+                // TODO: Hook me up to expand table row to display all spaces inline
+                <EuiButtonEmpty size="xs">
+                  +{spaces.length - SPACES_DISPLAY_COUNT} more
+                </EuiButtonEmpty>
               ) : null}
-            </EuiFlexGroup>
+            </div>
           );
         },
       },
@@ -168,16 +158,20 @@ export class PrivilegeSpaceTable extends Component<Props, {}> {
         name: 'Actions',
         actions: [
           {
+            name: 'Edit',
             description: 'Edit these privileges',
             icon: 'pencil',
+            type: 'icon',
             onClick: (item: TableRow) => {
               this.props.onEdit(item.spacesIndex);
             },
           },
           {
+            name: 'Delete',
             description: 'Delete these privileges',
             icon: 'trash',
             color: 'danger',
+            type: 'icon',
             onClick: (item: TableRow) => {
               const roleCopy = copyRole(this.props.role);
               roleCopy.kibana.spaces.splice(item.spacesIndex, 1);
@@ -188,7 +182,20 @@ export class PrivilegeSpaceTable extends Component<Props, {}> {
       },
     ];
 
-    return <EuiInMemoryTable columns={columns} items={rows} />;
+    return (
+      <EuiInMemoryTable
+        columns={columns}
+        items={rows}
+        // TODO: FIX the ts-ignores
+        // @ts-ignore
+        rowProps={item => {
+          // TODO: Find the global space the right way
+          return {
+            className: item.spaces[0].id === '*' ? 'secPrivilegeTable__row--isGlobalSpace' : '',
+          };
+        }}
+      />
+    );
   };
 
   private getSortedPrivileges = () => {
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
index ee0a91deaa3b2..4971614607d5e 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
@@ -49,8 +49,8 @@ interface State {
 class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
   private globalSpaceEntry: Space = {
     id: '*',
-    name: '* (all spaces)',
-    color: '#afafaf',
+    name: '* Global (all spaces)',
+    color: '#D3DAE6',
     initials: '*',
     disabledFeatures: [],
   };
@@ -181,7 +181,7 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
             <p>
               <FormattedMessage
                 id="foo"
-                defaultMessage="This role does not grant any access to Kibana."
+                defaultMessage="This role does not grant any access to Kibana. Add privileges to existing spaces or groups of existing spaces using the button below."
               />
             </p>
           </Fragment>
@@ -203,32 +203,16 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
       <EuiButton
         color="primary"
         onClick={this.addSpacePrivilege}
-        iconType={'spacesApp'}
+        iconType={'plusInCircleFilled'}
         data-test-subj={'addSpacePrivilegeButton'}
+        isDisabled={!hasAvailableSpaces}
       >
-        Add a privilege
+        Add space privilege
       </EuiButton>
     );
 
-    const addPrivilegeDescription = (
-      <Fragment>
-        <EuiSpacer size={'s'} />
-        <EuiText color={'subdued'} size={'s'}>
-          <FormattedMessage
-            id="foo"
-            defaultMessage="Customize by existing spaces or groups of existing spaces."
-          />
-        </EuiText>
-      </Fragment>
-    );
-
     if (!hasPrivilegesAssigned) {
-      return (
-        <div>
-          {addPrivilegeButton}
-          {addPrivilegeDescription}
-        </div>
-      );
+      return addPrivilegeButton;
     }
 
     const viewMatrixButton = (
@@ -240,18 +224,11 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
       />
     );
 
-    if (!hasAvailableSpaces) {
-      return viewMatrixButton;
-    }
-
     return (
-      <div>
-        <EuiFlexGroup justifyContent="spaceBetween">
-          {hasAvailableSpaces && <EuiFlexItem grow={false}>{addPrivilegeButton}</EuiFlexItem>}
-          {hasPrivilegesAssigned && <EuiFlexItem grow={false}>{viewMatrixButton}</EuiFlexItem>}
-        </EuiFlexGroup>
-        {hasAvailableSpaces && addPrivilegeDescription}
-      </div>
+      <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiFlexItem grow={false}>{addPrivilegeButton}</EuiFlexItem>
+        {hasPrivilegesAssigned && <EuiFlexItem grow={false}>{viewMatrixButton}</EuiFlexItem>}
+      </EuiFlexGroup>
     );
   };
 
diff --git a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index 6e06bf2df3dfb..225c78b10564a 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -55,6 +55,7 @@ export class SpaceSelector extends Component<Props, {}> {
 
     return (
       <EuiComboBox
+        fullWidth
         options={this.props.spaces.map(space =>
           spaceToOption(
             space,
diff --git a/x-pack/plugins/security/public/views/management/edit_role/edit_role.less b/x-pack/plugins/security/public/views/management/edit_role/edit_role.less
deleted file mode 100644
index 4e0514200b5c7..0000000000000
--- a/x-pack/plugins/security/public/views/management/edit_role/edit_role.less
+++ /dev/null
@@ -1,4 +0,0 @@
-#editRoleReactRoot {
-  background: #F5F7FA;
-  min-height: ~"calc(100vh - 70px)";
-}
diff --git a/x-pack/plugins/security/public/views/management/edit_role/edit_role.scss b/x-pack/plugins/security/public/views/management/edit_role/edit_role.scss
index 5fb0266fa8054..6025f3ca004c3 100644
--- a/x-pack/plugins/security/public/views/management/edit_role/edit_role.scss
+++ b/x-pack/plugins/security/public/views/management/edit_role/edit_role.scss
@@ -1,6 +1,4 @@
-@import './components/collapsible_panel/collapsible_panel';
-
 #editRoleReactRoot {
   background: $euiColorLightestShade;
   min-height: calc(100vh - 70px);
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/security/public/views/management/index.scss b/x-pack/plugins/security/public/views/management/index.scss
deleted file mode 100644
index 7d6213a1cdeba..0000000000000
--- a/x-pack/plugins/security/public/views/management/index.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-// Edit role styles
-@import './edit_role/edit_role';
-
-
-$securityFormWidth: 460px;
-
-// Management styles
-.mgtForm__panel {
-  max-width: $securityFormWidth;
-
-  .mgtForm__subLabel {
-    margin-bottom: $euiSizeS;
-  }
-}
-
-.mgtForm__footer {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-
-  .kuiButton + .kuiButton {
-    margin-left: $euiSizeS;
-  }
-}
-
-.mgtUsersEditPage,
-.mgtUsersListingPage {
-  min-height: calc(100vh - 70px);
-}
-
-.mgtUsersListingPage__content {
-  flex-grow: 0;
-}
-
-.mgtUsersEditPage__content {
-  max-width: $securityFormWidth;
-  margin-left: auto;
-  margin-right: auto;
-  flex-grow: 0;
-}
\ No newline at end of file
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
index 052c9a8a964d8..ca02fcb6da567 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
@@ -58,7 +58,7 @@ export class FeatureTable extends Component<Props, {}> {
       render: (feature: Feature) => {
         return (
           <EuiText>
-            <EuiIcon type={feature.icon as IconType} />
+            <EuiIcon size="m" type={feature.icon as IconType} />
             &ensp; {feature.name}
           </EuiText>
         );