diff --git a/src/app/main/main-layout-header.js b/src/app/main/main-layout-header.js
index cfaf9de5..23dceac7 100644
--- a/src/app/main/main-layout-header.js
+++ b/src/app/main/main-layout-header.js
@@ -5,6 +5,7 @@ import CommonActions      from 'actions/common-actions';
 
 import Button             from 'core-components/button';
 import DropDown           from 'core-components/drop-down';
+import Icon               from 'core-components/icon';
 
 var languageList = ['English', 'Spanish', 'Portuguese', 'German', 'Turkish', 'Indian'];
 var codeLanguages = {
@@ -35,7 +36,7 @@ var MainLayoutHeader = React.createClass({
             return {
                 content: (
                     <span>
-                        <img className="language-icon" src={`../images/icons/${codeLanguages[item]}.png`} />{item}
+                        <Icon name={codeLanguages[item]} />{item}
                     </span>
                 )
             };
diff --git a/src/core-components/drop-down.js b/src/core-components/drop-down.js
index ede063f2..d1c74041 100644
--- a/src/core-components/drop-down.js
+++ b/src/core-components/drop-down.js
@@ -4,7 +4,6 @@ import _                  from 'lodash';
 import {Motion, spring}   from 'react-motion';
 
 import callback           from 'lib/callback';
-import getIcion           from 'lib/callback';
 
 var DropDown = React.createClass({
 
@@ -44,7 +43,7 @@ var DropDown = React.createClass({
         return {
             defaultStyle: closedStyle,
             style: (this.state.opened) ? openedStyle : closedStyle
-        }
+        };
     },
 
     render() {
diff --git a/src/core-components/icon.js b/src/core-components/icon.js
new file mode 100644
index 00000000..bb4cb283
--- /dev/null
+++ b/src/core-components/icon.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+var Icon = React.createClass({
+
+    propTypes: {
+        name: React.PropTypes.string.isRequired
+    },
+
+    render() {
+        return (
+            <img className="language-icon" src={`../images/icons/${this.props.name}.png`} />
+        );
+    }
+
+});
+
+export default Icon;
\ No newline at end of file