diff --git a/src/components/ControlPanel/ControlPane.css b/src/components/ControlPanel/ControlPane.css
index d0412d03bd30..9c3e4d8a3b0e 100644
--- a/src/components/ControlPanel/ControlPane.css
+++ b/src/components/ControlPanel/ControlPane.css
@@ -14,7 +14,7 @@
     width: 100%;
     padding: 12px;
     margin: 0;
-    border: 2px solid rgb(230, 230, 230);
+    border: 2px solid var(--textFieldBorderColor);
     border-radius: var(--borderRadius);
     outline: 0;
     box-shadow: none;
diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css
index 5fc0c6fd780a..90f3f500bdfd 100644
--- a/src/components/EntryEditor/EntryEditor.css
+++ b/src/components/EntryEditor/EntryEditor.css
@@ -54,5 +54,5 @@
 }
 
 .ProseMirror {
-  border: 2px solid rgb(230, 230, 230);
+  border: 2px solid var(--textFieldBorderColor);
 }
diff --git a/src/components/EntryListing/EntryListing.css b/src/components/EntryListing/EntryListing.css
index 450611547eb5..9a079ce3f73b 100644
--- a/src/components/EntryListing/EntryListing.css
+++ b/src/components/EntryListing/EntryListing.css
@@ -1,7 +1,5 @@
 .card {
-  flex-grow: 1;
-  flex-basis: 31%;
-  flex-basis: 300px;
+  flex: 0 300px;
   overflow: hidden;
   margin-bottom: 16px;
   margin-left: 16px;
diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css
index f323d7bb3225..99555972718d 100644
--- a/src/components/UI/card/Card.css
+++ b/src/components/UI/card/Card.css
@@ -1,9 +1,9 @@
 @import '../theme.css';
 
 .card {
-  composes: base container rounded depth;
+  composes: base container rounded;
   overflow: hidden;
-  border: 1px solid #f7f8f8;
+  border: 2px solid var(--textFieldBorderColor);
   transition: all .1s ease-in-out;
   transform: translateY(0);
   padding: 16px 24px;
diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css
index f244467854f4..1569aef7fa57 100644
--- a/src/components/UI/theme.css
+++ b/src/components/UI/theme.css
@@ -17,12 +17,13 @@
   --topmostZindex: 99999;
   --foregroundAltColor: #fff;
   --backgroundAltColor: #232528;
-  --textFieldBorderColor: #e7e7e7;
+  --textFieldBorderColor: #e6e6e6;
   --highlightFGColor: #fff;
   --highlightBGColor: #3ab7a5;
   --highlightFGAltColor: #eee;
   --controlLabelColor: #8b8b8b;
   --controlBGColor: #fff;
+  --control
   --backgroundTertiaryColor: #fff;
   --backgroundTertiaryColorDark: color(var(--backgroundTertiaryColor) lightness(90%));
 }
@@ -40,10 +41,6 @@
   border-radius: var(--borderRadius);
 }
 
-.depth {
-  box-shadow: var(--dropShadow);
-}
-
 .clearfix:after {
   content: '';
   display: table;
diff --git a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css
index 3e0cc5c6d85e..0dff2b901746 100644
--- a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css
+++ b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css
@@ -1,9 +1,6 @@
 @import "../../../UI/theme";
 
 .editorControlBar {
-  background-color: var(--controlBGColor);
-  border-bottom: 1px solid var(--backgroundTertiaryColorDark);
-  border-radius: var(--borderRadius) var(--borderRadius) 0 0;
   z-index: 1;
 }
 
@@ -70,8 +67,7 @@
     padding: 12px;
     border-radius: var(--borderRadius);
     overflow-x: auto;
-    border: 2px solid rgb(230, 230, 230);
-    border-top: 1px solid rgb(230, 230, 230);
+    border: 2px solid var(--textFieldBorderColor);
     min-height: 500px;
 
     & ul {