diff --git a/src/components/SchemaRow.tsx b/src/components/SchemaRow.tsx
index cd5ae311..053fa7fb 100644
--- a/src/components/SchemaRow.tsx
+++ b/src/components/SchemaRow.tsx
@@ -50,30 +50,33 @@ export const SchemaRow: React.FunctionComponent<ISchemaRow> = ({ node, treeStore
       <div
         className="flex flex-1 items-center text-sm leading-tight w-full h-full relative"
         style={{
-          marginLeft: ICON_DIMENSION * (node.level + 1) + ROW_OFFSET, // offset for spacing
+          marginLeft: ICON_DIMENSION * node.level, // offset for spacing
         }}
       >
-        {node.canHaveChildren && (
-          <div
-            className="absolute flex justify-center cursor-pointer p-1 rounded hover:bg-darken-3"
-            style={{
-              left: ICON_DIMENSION * -1 + ROW_OFFSET / -2,
-              width: ICON_DIMENSION,
-              height: ICON_DIMENSION,
-            }}
-          >
-            <Icon
-              iconSize={ICON_SIZE}
-              icon={treeStore.isNodeExpanded(node) ? 'caret-down' : 'caret-right'}
-              color={Colors.GRAY1}
-            />
-          </div>
-        )}
+        {node.canHaveChildren &&
+          node.level > 0 && (
+            <div
+              className="absolute flex justify-center cursor-pointer p-1 rounded hover:bg-darken-3"
+              style={{
+                left: ICON_DIMENSION * -1 + ROW_OFFSET / -2,
+                width: ICON_DIMENSION,
+                height: ICON_DIMENSION,
+              }}
+            >
+              <Icon
+                iconSize={ICON_SIZE}
+                icon={treeStore.isNodeExpanded(node) ? 'caret-down' : 'caret-right'}
+                color={Colors.GRAY1}
+              />
+            </div>
+          )}
 
         {schemaNode.divider && (
-          <div className="flex items-center w-full h-2 absolute" style={{ top: -11, left: -16 }}>
-            <div className="font-bold text-darken-7 pr-2 uppercase">{schemaNode.divider}</div>
-            <div className="flex-1 bg-darken-5" style={{ height: 2 }} />
+          <div className="flex items-center w-full absolute" style={{ top: -9, height: 1 }}>
+            <div className="font-medium text-darken-7 pr-2 uppercase text-xs" style={{ marginLeft: -10 }}>
+              {schemaNode.divider}
+            </div>
+            <div className="flex-1 bg-darken-5" style={{ height: 1 }} />
           </div>
         )}
 
diff --git a/src/components/SchemaTree.tsx b/src/components/SchemaTree.tsx
index b6a9150b..389ca4be 100644
--- a/src/components/SchemaTree.tsx
+++ b/src/components/SchemaTree.tsx
@@ -38,7 +38,7 @@ export const SchemaTree = observer<ISchemaTree>(props => {
     <div className={cn(className, 'flex flex-col h-full w-full')}>
       {name &&
         !hideTopBar && (
-          <div className="flex items-center text-sm px-6 font-semibold" style={{ height: 30 }}>
+          <div className="flex items-center text-sm px-2 font-semibold" style={{ height: 30 }}>
             {name}
           </div>
         )}