diff --git a/src/components/formik-forms/formik-input.jsx b/src/components/formik-forms/formik-input.jsx
index 8df63032a..908fc8890 100644
--- a/src/components/formik-forms/formik-input.jsx
+++ b/src/components/formik-forms/formik-input.jsx
@@ -34,15 +34,15 @@ const FormikInput = ({
         />
         {error ? (
             <ValidationMessage
-                isError
                 className={validationClassName}
                 message={error}
+                mode="error"
             />
         ) : toolTip && (
             <ValidationMessage
-                isOk
                 className={validationClassName}
                 message={toolTip}
+                mode="info"
             />
         )}
     </div>
@@ -52,7 +52,7 @@ const FormikInput = ({
 FormikInput.propTypes = {
     className: PropTypes.string,
     error: PropTypes.string,
-    toolTip: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
+    toolTip: PropTypes.string,
     type: PropTypes.string,
     validationClassName: PropTypes.string,
     wrapperClassName: PropTypes.string
diff --git a/src/components/formik-forms/formik-select.jsx b/src/components/formik-forms/formik-select.jsx
index 2bd1f6ff5..548e335e9 100644
--- a/src/components/formik-forms/formik-select.jsx
+++ b/src/components/formik-forms/formik-select.jsx
@@ -37,9 +37,9 @@ const FormikSelect = ({
             </Field>
             {error && (
                 <ValidationMessage
-                    isError
                     className={validationClassName}
                     message={error}
+                    mode="error"
                 />
             )}
         </div>
diff --git a/src/components/forms/validation-message.jsx b/src/components/forms/validation-message.jsx
index 0664995fb..717128e39 100644
--- a/src/components/forms/validation-message.jsx
+++ b/src/components/forms/validation-message.jsx
@@ -9,8 +9,8 @@ const ValidationMessage = props => (
         className={classNames(
             'validation-message',
             {
-                'validation-error': props.isError,
-                'validation-ok': props.isOk
+                'validation-error': props.mode === 'error',
+                'validation-info': props.mode === 'info'
             },
             props.className
         )}
@@ -21,9 +21,8 @@ const ValidationMessage = props => (
 
 ValidationMessage.propTypes = {
     className: PropTypes.string,
-    isError: PropTypes.bool,
-    isOk: PropTypes.bool,
-    message: PropTypes.string
+    message: PropTypes.string,
+    mode: PropTypes.string
 };
 
 module.exports = ValidationMessage;
diff --git a/src/components/forms/validation-message.scss b/src/components/forms/validation-message.scss
index 7a2acbd84..acb19820a 100644
--- a/src/components/forms/validation-message.scss
+++ b/src/components/forms/validation-message.scss
@@ -59,7 +59,7 @@
     }
 }
 
-.validation-ok {
+.validation-info {
     background-color: $ui-blue;
 
     &:before {