diff --git a/superset-frontend/src/components/DatabaseSelector.tsx b/superset-frontend/src/components/DatabaseSelector.tsx
index f426e1aa1fc09..52c3f7a2f3f08 100644
--- a/superset-frontend/src/components/DatabaseSelector.tsx
+++ b/superset-frontend/src/components/DatabaseSelector.tsx
@@ -183,8 +183,7 @@ export default function DatabaseSelector({
   function renderDatabaseOption(db: any) {
     return (
       <span title={db.database_name}>
-        <Label bsStyle="default">{db.backend}</Label>
-        {db.database_name}
+        <Label bsStyle="default">{db.backend}</Label> {db.database_name}
       </span>
     );
   }
diff --git a/superset-frontend/src/components/Label/index.tsx b/superset-frontend/src/components/Label/index.tsx
index e87451f8f5bfa..44403be7f52c9 100644
--- a/superset-frontend/src/components/Label/index.tsx
+++ b/superset-frontend/src/components/Label/index.tsx
@@ -42,6 +42,7 @@ const SupersetLabel = styled(BootstrapLabel)`
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  vertical-align: middle;
 
   &:first-of-type {
     margin-left: 0;
diff --git a/superset-frontend/src/components/Timer.tsx b/superset-frontend/src/components/Timer.tsx
index 3586103182878..22b11f416663f 100644
--- a/superset-frontend/src/components/Timer.tsx
+++ b/superset-frontend/src/components/Timer.tsx
@@ -30,8 +30,8 @@ interface TimerProps {
 }
 
 const TimerLabel = styled(Label)`
-  width: 80px;
-  text-align: right;
+  width: 96px;
+  text-align: center;
 `;
 
 export default function Timer({