diff --git a/src/components/input/styled.js b/src/components/input/styled.js
index 1f02bf68..528a7f90 100644
--- a/src/components/input/styled.js
+++ b/src/components/input/styled.js
@@ -15,12 +15,12 @@ export const Input = styled(Flex).attrs(props => ({
   background: "inputBg",
   backgroundOpacity: props.disabled ? 0.4 : 1,
   width: "100%",
-  border: props.error ? "error" : props.hasValue ? "text" : "inputBorder",
+  border: props.error ? "error" : "inputBorder",
   _hover: {
     border: props.error ? "errorText" : "inputBorderHover",
   },
   _focus: {
-    border: props.error ? "errorText" : "inputBorderFocus",
+    border: props.error ? "error" : "inputBorder",
   },
   padding: [0.5, 1],
   height: 6,
diff --git a/src/theme/dark/colors.js b/src/theme/dark/colors.js
index 53e5cb8e..e13a507d 100644
--- a/src/theme/dark/colors.js
+++ b/src/theme/dark/colors.js
@@ -72,7 +72,8 @@ const appColors = {
   selected: rawColors.neutral.grey55,
   highlight: rawColors.neutral.grey55,
   tooltip: rawColors.neutral.outerSpace,
-  tooltipText: rawColors.neutral.white,
+  tooltipText: rawColors.neutral.grey150,
+  tooltipBg: rawColors.neutral.grey10,
   bright: rawColors.neutral.white,
   text: rawColors.neutral.grey155,
   textLite: rawColors.neutral.grey120,
diff --git a/src/theme/default/colors.js b/src/theme/default/colors.js
index d709b9d7..175aced5 100644
--- a/src/theme/default/colors.js
+++ b/src/theme/default/colors.js
@@ -74,6 +74,7 @@ const appColors = {
 
   tooltip: rawColors.neutral.grey180,
   tooltipText: rawColors.neutral.grey100,
+  tooltipBg: rawColors.neutral.grey190,
   bright: rawColors.neutral.white,
   text: rawColors.neutral.grey100,
   textLite: rawColors.neutral.grey120,