diff --git a/client/src/app/demo/components-demo-page.js b/client/src/app/demo/components-demo-page.js
index b19470a0..ef679cbd 100644
--- a/client/src/app/demo/components-demo-page.js
+++ b/client/src/app/demo/components-demo-page.js
@@ -173,10 +173,7 @@ let DemoPage = React.createClass({
         {
             title: 'InfoTooltip',
             render: (
-                <div>
-                    <InfoTooltip text="You should read the manual" />
-                    <InfoTooltip type="warning" text="No staff member is assigned to this department." />
-                </div>
+                <InfoTooltip type="warning" text="No staff member is assigned to this department." />
             )
         }
 	],
diff --git a/client/src/core-components/info-tooltip.js b/client/src/core-components/info-tooltip.js
index 6e78f557..b2c92f10 100644
--- a/client/src/core-components/info-tooltip.js
+++ b/client/src/core-components/info-tooltip.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 
+import i18n from 'lib-app/i18n';
 import Icon from 'core-components/icon';
 import Tooltip from 'core-components/tooltip';
 
@@ -31,10 +32,10 @@ class InfoTooltip extends React.Component {
     }
 
     renderText() {
-        let message = (this.props.type === 'default') ? 'Information' : 'Warning';
+        let message = (this.props.type === 'default') ? i18n('INFO') : i18n('WARNING');
         return (
             <div className="info-tooltip__text">
-                <div className="info-tooltip__text__title">
+                <div className="info-tooltip__text-title">
                     {message}
                 </div>
                 {this.props.text}
diff --git a/client/src/core-components/info-tooltip.scss b/client/src/core-components/info-tooltip.scss
index 4fc65c39..63691bad 100644
--- a/client/src/core-components/info-tooltip.scss
+++ b/client/src/core-components/info-tooltip.scss
@@ -2,7 +2,7 @@
 
 .info-tooltip {
     &__text {
-        &__title {
+        &-title {
             color: $secondary-blue;
             font-size: $font-size--md;
         }
@@ -18,7 +18,7 @@
         }
 
         .info-tooltip__text {
-            &__title {
+            &-title {
                 color: $primary-red;
             }
         }
diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js
index 25e74b18..556666fc 100644
--- a/client/src/data/languages/en.js
+++ b/client/src/data/languages/en.js
@@ -72,6 +72,8 @@ export default {
     'UN_ASSIGN': 'Unassign',
     'VIEW_TICKET': 'View Ticket',
     'SELECT_CUSTOM_RESPONSE': 'Select a custom response...',
+    'WARNING': 'Warning',
+    'INFO': 'Information',
 
     //VIEW DESCRIPTIONS
     'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.',
@@ -108,4 +110,4 @@ export default {
     'OLD_PASSWORD_INCORRECT': 'Old password is incorrect',
     'WILL_LOSE_CHANGES': 'You haven\'t save. Your changes will be lost.',
     'WILL_DELETE_CUSTOM_RESPONSE': 'The custom response will be deleted.'
-};
\ No newline at end of file
+};