diff --git a/integration/__tests__/app.tests.ts b/integration/__tests__/app.tests.ts
index 0c28359317..5bf707fb71 100644
--- a/integration/__tests__/app.tests.ts
+++ b/integration/__tests__/app.tests.ts
@@ -73,7 +73,7 @@ describe("Lens integration tests", () => {
         }
 
         await app.client.click("[data-testid=kubernetes-tab]");
-        await app.client.waitUntilTextExists("div.repos .repoName", repos[0].name); // wait for the helm-cli to fetch the repo(s)
+        await app.client.waitUntilTextExists("[data-testid=repository-name]", repos[0].name); // wait for the helm-cli to fetch the repo(s)
         await app.client.click("#HelmRepoSelect"); // click the repo select to activate the drop-down
         await app.client.waitUntilTextExists("div.Select__option", "");  // wait for at least one option to appear (any text)
       });
diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx
index 0265a6ddf3..3d616b4b20 100644
--- a/src/renderer/components/+extensions/extensions.tsx
+++ b/src/renderer/components/+extensions/extensions.tsx
@@ -515,7 +515,7 @@ export class Extensions extends React.Component<Props> {
           <section>
             <h1>Extensions</h1>
 
-            <Notice>
+            <Notice className="mb-14 mt-3">
               <p>
                 Add new features via Lens Extensions.{" "}
                 Check out <a href={`${docsUrl}/extensions/`} target="_blank" rel="noreferrer">docs</a>{" "}
diff --git a/src/renderer/components/+extensions/notice.module.css b/src/renderer/components/+extensions/notice.module.css
index 81b90c48ad..fbe5bec901 100644
--- a/src/renderer/components/+extensions/notice.module.css
+++ b/src/renderer/components/+extensions/notice.module.css
@@ -20,7 +20,7 @@
  */
 
 .notice {
-  @apply p-8 flex flex-col gap-2 mb-14 mt-3 rounded-lg;
+  @apply p-8 flex flex-col gap-2 rounded-lg;
   background-color: var(--inputControlBackground);
   border: 1px solid var(--boxShadow);
   color: var(--textColorTertiary);
diff --git a/src/renderer/components/+extensions/notice.tsx b/src/renderer/components/+extensions/notice.tsx
index e4b844a0ae..511388a09b 100644
--- a/src/renderer/components/+extensions/notice.tsx
+++ b/src/renderer/components/+extensions/notice.tsx
@@ -21,12 +21,15 @@
 
 import styles from "./notice.module.css";
 import React, { DOMAttributes } from "react";
+import { cssNames } from "../../utils";
 
-interface Props extends DOMAttributes<any> {}
+interface Props extends DOMAttributes<any> {
+  className?: string;
+}
 
 export function Notice(props: Props) {
   return (
-    <div className={styles.notice}>
+    <div className={cssNames(styles.notice, props.className)}>
       {props.children}
     </div>
   );
diff --git a/src/renderer/components/+preferences/helm-charts.scss b/src/renderer/components/+preferences/helm-charts.module.css
similarity index 75%
rename from src/renderer/components/+preferences/helm-charts.scss
rename to src/renderer/components/+preferences/helm-charts.module.css
index 61d99c909a..287124cd41 100644
--- a/src/renderer/components/+preferences/helm-charts.scss
+++ b/src/renderer/components/+preferences/helm-charts.module.css
@@ -19,24 +19,15 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-.HelmCharts {
-  .repos {
-    margin-top: 20px;
+.repos {
+  @apply mt-6 flex flex-col;
+}
 
-    .repo {
-      background: var(--inputControlBackground);
-      border-radius: 4px;
-      padding: 12px 16px;
-      box-shadow: 0 0 0 1px var(--secondaryBackground);
+.repoName {
+  font-weight: 500;
+  margin-bottom: 8px;
+}
 
-      .repoName {
-        font-weight: 500;
-        margin-bottom: 8px;
-      }
-
-      .repoUrl {
-        color: var(--textColorDimmed);
-      }
-    }
-  }
+.repoUrl {
+  color: var(--textColorDimmed);
 }
\ No newline at end of file
diff --git a/src/renderer/components/+preferences/helm-charts.tsx b/src/renderer/components/+preferences/helm-charts.tsx
index 94f95ccb40..d0dd47e464 100644
--- a/src/renderer/components/+preferences/helm-charts.tsx
+++ b/src/renderer/components/+preferences/helm-charts.tsx
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import "./helm-charts.scss";
+import styles from "./helm-charts.module.css";
 
 import React from "react";
 import { action, computed, observable, makeObservable } from "mobx";
@@ -31,6 +31,9 @@ import { Notifications } from "../notifications";
 import { Select, SelectOption } from "../select";
 import { AddHelmRepoDialog } from "./add-helm-repo-dialog";
 import { observer } from "mobx-react";
+import { RemovableItem } from "./removable-item";
+import { Notice } from "../+extensions/notice";
+import { Spinner } from "../spinner";
 
 @observer
 export class HelmCharts extends React.Component {
@@ -117,9 +120,36 @@ export class HelmCharts extends React.Component {
     );
   };
 
+  renderRepositories() {
+    const repos = Array.from(this.addedRepos);
+
+    if (this.loading) {
+      return <div className="pt-5 relative"><Spinner center/></div>;
+    }
+
+    if (!repos.length) {
+      return (
+        <Notice>
+          <div className="flex-grow text-center">The repositories have not been added yet</div>
+        </Notice>
+      );
+    }
+
+    return repos.map(([name, repo]) => {
+      return (
+        <RemovableItem key={name} onRemove={() => this.removeRepo(repo)} className="mt-3">
+          <div>
+            <div data-testid="repository-name" className={styles.repoName}>{name}</div>
+            <div className={styles.repoUrl}>{repo.url}</div>
+          </div>
+        </RemovableItem>
+      );
+    });
+  }
+
   render() {
     return (
-      <div className="HelmCharts">
+      <div>
         <div className="flex gaps">
           <Select id="HelmRepoSelect"
             placeholder="Repositories"
@@ -139,22 +169,8 @@ export class HelmCharts extends React.Component {
           />
         </div>
         <AddHelmRepoDialog onAddRepo={() => this.loadRepos()}/>
-        <div className="repos flex gaps column">
-          {Array.from(this.addedRepos).map(([name, repo]) => {
-            return (
-              <div key={name} className="repo flex gaps align-center justify-space-between">
-                <div>
-                  <div className="repoName">{name}</div>
-                  <div className="repoUrl">{repo.url}</div>
-                </div>
-                <Icon
-                  material="delete"
-                  onClick={() => this.removeRepo(repo)}
-                  tooltip="Remove"
-                />
-              </div>
-            );
-          })}
+        <div className={styles.repos}>
+          {this.renderRepositories()}
         </div>
       </div>
     );
diff --git a/src/renderer/components/+preferences/kubeconfig-syncs.tsx b/src/renderer/components/+preferences/kubeconfig-syncs.tsx
index c09113aac1..35b3d88b04 100644
--- a/src/renderer/components/+preferences/kubeconfig-syncs.tsx
+++ b/src/renderer/components/+preferences/kubeconfig-syncs.tsx
@@ -18,19 +18,20 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
-import React from "react";
-import { Avatar, IconButton, List, ListItem, ListItemAvatar, ListItemSecondaryAction, ListItemText, Paper } from "@material-ui/core";
-import { Description, Folder, Delete, HelpOutline } from "@material-ui/icons";
-import { action, computed, observable, reaction, makeObservable } from "mobx";
-import { disposeOnUnmount, observer } from "mobx-react";
 import fse from "fs-extra";
+import { action, computed, makeObservable, observable, reaction } from "mobx";
+import { disposeOnUnmount, observer } from "mobx-react";
+import React from "react";
+import { Notice } from "../+extensions/notice";
+
 import { KubeconfigSyncEntry, KubeconfigSyncValue, UserStore } from "../../../common/user-store";
-import { Spinner } from "../spinner";
+import { isWindows } from "../../../common/vars";
 import logger from "../../../main/logger";
 import { iter, multiSet } from "../../utils";
-import { isWindows } from "../../../common/vars";
+import { SubTitle } from "../layout/sub-title";
 import { PathPicker } from "../path-picker/path-picker";
+import { Spinner } from "../spinner";
+import { RemovableItem } from "./removable-item";
 
 interface SyncInfo {
   type: "file" | "folder" | "unknown";
@@ -111,41 +112,29 @@ export class KubeconfigSyncs extends React.Component {
   @action
   onPick = async (filePaths: string[]) => multiSet(this.syncs, await getAllEntries(filePaths));
 
-  renderEntryIcon(entry: Entry) {
+  getIconName(entry: Entry) {
     switch (entry.info.type) {
       case "file":
-        return <Description />;
+        return "description";
       case "folder":
-        return <Folder />;
+        return "folder";
       case "unknown":
-        return <HelpOutline />;
+        return "help_outline";
     }
   }
 
   renderEntry = (entry: Entry) => {
     return (
-      <Paper className="entry" key={entry.filePath} elevation={3}>
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar>
-              {this.renderEntryIcon(entry)}
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText
-            primary={entry.filePath}
-            className="description"
-          />
-          <ListItemSecondaryAction className="action">
-            <IconButton
-              edge="end"
-              aria-label="delete"
-              onClick={() => this.syncs.delete(entry.filePath)}
-            >
-              <Delete />
-            </IconButton>
-          </ListItemSecondaryAction>
-        </ListItem>
-      </Paper>
+      <RemovableItem
+        key={entry.filePath}
+        onRemove={() => this.syncs.delete(entry.filePath)}
+        className="mt-3"
+        icon={this.getIconName(entry)}
+      >
+        <div className="flex-grow break-all">
+          {entry.filePath}
+        </div>
+      </RemovableItem>
     );
   };
 
@@ -160,27 +149,34 @@ export class KubeconfigSyncs extends React.Component {
       );
     }
 
+    if (!entries.length) {
+      return (
+        <Notice className="mt-3">
+          <div className="flex-grow text-center">No files and folders have been synced yet</div>
+        </Notice>
+      );
+    }
+
     return (
-      <List className="kubeconfig-sync-list">
+      <div>
         {entries.map(this.renderEntry)}
-      </List>
+      </div>
     );
   }
 
   renderSyncButtons() {
     if (isWindows) {
       return (
-        <div className="flex gaps align-center">
+        <div className="flex gaps align-center mb-5">
           <PathPicker
             label="Sync file(s)"
-            className="box grow"
             onPick={this.onPick}
             buttonLabel="Sync"
             properties={["showHiddenFiles", "multiSelections", "openFile"]}
           />
+          <span>or</span>
           <PathPicker
             label="Sync folder(s)"
-            className="box grow"
             onPick={this.onPick}
             buttonLabel="Sync"
             properties={["showHiddenFiles", "multiSelections", "openDirectory"]}
@@ -190,12 +186,14 @@ export class KubeconfigSyncs extends React.Component {
     }
 
     return (
-      <PathPicker
-        label="Sync file(s) and folder(s)"
-        onPick={this.onPick}
-        buttonLabel="Sync"
-        properties={["showHiddenFiles", "multiSelections", "openFile", "openDirectory"]}
-      />
+      <div className="self-start mb-5">
+        <PathPicker
+          label="Sync Files and Folders"
+          onPick={this.onPick}
+          buttonLabel="Sync"
+          properties={["showHiddenFiles", "multiSelections", "openFile", "openDirectory"]}
+        />
+      </div>
     );
   }
 
@@ -203,6 +201,7 @@ export class KubeconfigSyncs extends React.Component {
     return (
       <>
         {this.renderSyncButtons()}
+        <SubTitle title="Synced Items" className="pt-5"/>
         {this.renderEntries()}
       </>
     );
diff --git a/src/renderer/components/+preferences/kubectl-binaries.tsx b/src/renderer/components/+preferences/kubectl-binaries.tsx
index 7cb3b8c105..9c7bff3132 100644
--- a/src/renderer/components/+preferences/kubectl-binaries.tsx
+++ b/src/renderer/components/+preferences/kubectl-binaries.tsx
@@ -46,7 +46,7 @@ export const KubectlBinaries = observer(() => {
 
   return (
     <>
-      <section className="small">
+      <section>
         <SubTitle title="Kubectl binary download"/>
         <FormSwitch
           control={
@@ -60,9 +60,7 @@ export const KubectlBinaries = observer(() => {
         />
       </section>
 
-      <hr className="small"/>
-
-      <section className="small">
+      <section>
         <SubTitle title="Download mirror" />
         <Select
           placeholder="Download mirror for kubectl"
@@ -74,9 +72,7 @@ export const KubectlBinaries = observer(() => {
         />
       </section>
 
-      <hr className="small"/>
-
-      <section className="small">
+      <section>
         <SubTitle title="Directory for binaries" />
         <Input
           theme="round-black"
@@ -92,9 +88,7 @@ export const KubectlBinaries = observer(() => {
         </div>
       </section>
 
-      <hr className="small"/>
-
-      <section className="small">
+      <section>
         <SubTitle title="Path to kubectl binary" />
         <Input
           theme="round-black"
diff --git a/src/renderer/components/+preferences/preferences.scss b/src/renderer/components/+preferences/preferences.scss
index 59e9e47ca0..d1cdd66f20 100644
--- a/src/renderer/components/+preferences/preferences.scss
+++ b/src/renderer/components/+preferences/preferences.scss
@@ -23,31 +23,4 @@
   .loading-spinner {
     margin: auto;
   }
-
-  .kubeconfig-sync-list {
-    .entry {
-      &.MuiPaper-root {
-        background-color: var(--inputControlBackground);
-        margin-bottom: var(--flex-gap, 1em);
-        color: inherit;
-      }
-
-      .MuiAvatar-root {
-        color: var(--buttonPrimaryBackground);
-        font-size: calc(2.5 * var(--unit));
-      }
-
-      .description {
-        font-family: monospace;
-
-        .MuiTypography-body1 {
-          font-size: var(--font-size);
-        }
-      }
-
-      .action .MuiIconButton-root {
-        font-size: calc(2.5 * var(--unit));
-      }
-    }
-  }
 }
diff --git a/src/renderer/components/+preferences/removable-item.module.css b/src/renderer/components/+preferences/removable-item.module.css
new file mode 100644
index 0000000000..e170da9532
--- /dev/null
+++ b/src/renderer/components/+preferences/removable-item.module.css
@@ -0,0 +1,7 @@
+.item {
+  --flex-gap: 1.2rem;
+
+  @apply rounded-md px-7 py-5 shadow-sm;
+  background: var(--inputControlBackground);
+  min-height: 65px;
+}
\ No newline at end of file
diff --git a/src/renderer/components/+preferences/removable-item.tsx b/src/renderer/components/+preferences/removable-item.tsx
new file mode 100644
index 0000000000..19164746fa
--- /dev/null
+++ b/src/renderer/components/+preferences/removable-item.tsx
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+import styles from "./removable-item.module.css";
+
+import React, { DOMAttributes } from "react";
+
+import { cssNames } from "../../utils";
+import { Icon } from "../icon";
+
+interface Props extends DOMAttributes<any>{
+  icon?: string;
+  onRemove: () => void;
+  className?: string;
+}
+
+export function RemovableItem({icon, onRemove, children, className, ...rest}: Props) {
+  return (
+    <div className={cssNames(styles.item, "flex gaps align-center justify-space-between", className)} {...rest}>
+      {icon && (
+        <Icon material={icon}/>
+      )}
+      {children}
+      <Icon
+        material="delete"
+        onClick={onRemove}
+        tooltip="Remove"
+      />
+    </div>
+  );
+}
diff --git a/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx b/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx
index 9c95c70c5d..583b44237a 100644
--- a/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-kubeconfig.tsx
@@ -43,7 +43,7 @@ export class ClusterKubeconfig extends React.Component<Props> {
 
   render() {
     return (
-      <Notice>
+      <Notice className="mb-14 mt-3">
         <SubTitle title="Kubeconfig" />
         <span>
           <a className="link value" onClick={this.openKubeconfig}>{this.props.cluster.kubeConfigPath}</a>
diff --git a/src/renderer/components/layout/setting-layout.scss b/src/renderer/components/layout/setting-layout.scss
index 3e6bfd8726..7fd66d0d90 100644
--- a/src/renderer/components/layout/setting-layout.scss
+++ b/src/renderer/components/layout/setting-layout.scss
@@ -228,7 +228,7 @@
       margin-top: 0;
       margin-bottom: 8px;
       padding-bottom: 0;
-      font-size: 12px;
+      font-size: 13px;
       line-height: 1;
     }