diff --git a/scm-ui-components/packages/ui-components/src/TableHeader.js b/scm-ui-components/packages/ui-components/src/TableHeader.js
index 8b38160027..f7463d3136 100644
--- a/scm-ui-components/packages/ui-components/src/TableHeader.js
+++ b/scm-ui-components/packages/ui-components/src/TableHeader.js
@@ -11,8 +11,7 @@ type Props = {
 const styles = {
   wrapper: {
     padding: "1rem 1.5rem 0.25rem 1.5rem",
-    border: "1px solid #eee",
-    borderRadius: "5px 5px 0 0"
+    borderBottom: "1px solid #dbdbdb"
   }
 };
 
diff --git a/scm-ui/src/repos/containers/ChangesetsRoot.js b/scm-ui/src/repos/containers/ChangesetsRoot.js
index 2eea64b8e1..c65c8f32cb 100644
--- a/scm-ui/src/repos/containers/ChangesetsRoot.js
+++ b/scm-ui/src/repos/containers/ChangesetsRoot.js
@@ -89,10 +89,10 @@ class BranchRoot extends React.Component<Props> {
     const changesets = <Changesets repository={repository} branch={branch} />;
 
     return (
-      <>
+      <div className="has-border-around is-round">
         {this.renderBranchSelector()}
         <Route path={`${url}/:page?`} component={() => changesets} />
-      </>
+      </div>
     );
   }
 
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index 810e2309ee..321c1faa16 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -93,7 +93,7 @@ class Sources extends React.Component<Props> {
 
     if (currentFileIsDirectory) {
       return (
-        <div className={"has-border-around"}>
+        <div className="has-border-around is-round">
           {this.renderBranchSelector()}
           <FileTree
             repository={repository}
diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss
index d31f40ceea..620410bd48 100644
--- a/scm-ui/styles/scm.scss
+++ b/scm-ui/styles/scm.scss
@@ -87,10 +87,11 @@ $fa-font-path: "webfonts";
 
 //border around options
 .has-border-around {
-  border-top: 1px solid #eee;
-  border-left: 1px solid #eee;
-  border-right: 1px solid #eee;
-  border-bottom: 1px solid #eee;
+  border: 1px solid #dbdbdb;
+
+  &.is-round {
+    border-radius: 4px;
+  }
 }
 
 // multiline Columns