diff --git a/package.json b/package.json
index 0e0f6b37e..044377b8e 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "promise": "7.1.1",
     "proxy-middleware": "0.14.0",
     "qs": "6.2.1",
-    "quran-components": "^0.0.65",
+    "quran-components": "^0.0.66",
     "raven": "1.1.1",
     "raw-loader": "0.5.1",
     "react": "15.4.1",
diff --git a/src/components/GlobalNav/Surah/index.js b/src/components/GlobalNav/Surah/index.js
index 7c6b9aab7..746e47d24 100644
--- a/src/components/GlobalNav/Surah/index.js
+++ b/src/components/GlobalNav/Surah/index.js
@@ -96,7 +96,7 @@ class GlobalNavSurah extends Component {
             toggle={<noscript />}
           >
             <div style={{ padding: 15 }}>
-              <h4>Settings</h4>
+              <h4><LocaleFormattedMessage id="setting.title" defaultMessage="Settings" /></h4>
             </div>
             <Menu>
               <InformationToggle
@@ -118,10 +118,6 @@ class GlobalNavSurah extends Component {
               <ContentDropdown
                 onOptionChange={this.handleOptionChange}
               />
-              <hr />
-              <div className={styles.title}>
-                <LocaleFormattedMessage id="setting.tooltip.title" defaultMessage="Tooltip Content" />
-              </div>
               <TooltipDropdown
                 tooltip={options.tooltip}
                 onOptionChange={setOption}
diff --git a/src/components/NightModeToggle/index.js b/src/components/NightModeToggle/index.js
index 54e42cc2d..46fe461ef 100644
--- a/src/components/NightModeToggle/index.js
+++ b/src/components/NightModeToggle/index.js
@@ -35,7 +35,7 @@ class NightModeToggle extends Component {
         icon={<i className="ss-icon ss-lightbulb vertical-align-middle" />}
         onClick={this.toggleNightMode}
       >
-        <LocaleFormattedMessage id="settings.nightMode" defaultMessage="Night Mode" />
+        <LocaleFormattedMessage id="setting.nightMode" defaultMessage="Night Mode" />
       </MenuItem>
     );
   }
diff --git a/src/components/Radio/index.js b/src/components/Radio/index.js
deleted file mode 100644
index 1d94fb551..000000000
--- a/src/components/Radio/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React, { PropTypes } from 'react';
-
-const styles = require('./style.scss');
-
-const Radio = ({ id, name, checked, handleChange, children }) => (
-  <label className={styles.radio} htmlFor={id}>
-    <input
-      id={id}
-      className={styles.input}
-      type="radio"
-      name={name}
-      checked={checked}
-      onChange={handleChange}
-    />
-    <span className={styles.outer}>
-      <span className={styles.inner} />
-    </span>
-    {children}
-  </label>
-);
-
-Radio.propTypes = {
-  id: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  checked: PropTypes.bool.isRequired,
-  handleChange: PropTypes.func.isRequired,
-  children: PropTypes.element.isRequired,
-};
-
-export default Radio;
diff --git a/src/components/Radio/style.scss b/src/components/Radio/style.scss
deleted file mode 100644
index a00b1fdee..000000000
--- a/src/components/Radio/style.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@import '../../styles/variables.scss';
-
-@-webkit-keyframes cardEnter {
-  0%, 20%, 40%, 60%, 80%, 100% {
-    -webkit-transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-  }
-  0% {
-    opacity: 0;
-    -webkit-transform: scale3d(0.3, 0.3, 0.3);
-  }
-  20% {
-    -webkit-transform: scale3d(1.1, 1.1, 1.1);
-  }
-  40% {
-    -webkit-transform: scale3d(0.9, 0.9, 0.9);
-  }
-  60% {
-    opacity: 1;
-    -webkit-transform: scale3d(1.03, 1.03, 1.03);
-  }
-  80% {
-    -webkit-transform: scale3d(0.97, 0.97, 0.97);
-  }
-  100% {
-    opacity: 1;
-    -webkit-transform: scale3d(1, 1, 1);
-  }
-}
-
-@keyframes cardEnter {
-  0%, 20%, 40%, 60%, 80%, 100% {
-    -webkit-transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-  }
-  0% {
-    opacity: 0;
-    -webkit-transform: scale3d(0.3, 0.3, 0.3);
-    transform: scale3d(0.3, 0.3, 0.3);
-  }
-  20% {
-    -webkit-transform: scale3d(1.1, 1.1, 1.1);
-    transform: scale3d(1.1, 1.1, 1.1);
-  }
-  40% {
-    -webkit-transform: scale3d(0.9, 0.9, 0.9);
-    transform: scale3d(0.9, 0.9, 0.9);
-  }
-  60% {
-    opacity: 1;
-    -webkit-transform: scale3d(1.03, 1.03, 1.03);
-    transform: scale3d(1.03, 1.03, 1.03);
-  }
-  80% {
-    -webkit-transform: scale3d(0.97, 0.97, 0.97);
-    transform: scale3d(0.97, 0.97, 0.97);
-  }
-  100% {
-    opacity: 1;
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.radio {
-  display: inline-block;
-  padding-right: 20px;
-  font-weight: 500;
-  color: #777;
-  line-height: 40px;
-  cursor: pointer;
-}
-
-.radio:hover .inner {
-  -webkit-transform: scale(0.5);
-  -ms-transform: scale(0.5);
-  transform: scale(0.5);
-  opacity: .5;
-}
-
-.radio .input {
-  width: 1px;
-  height: 1px;
-  opacity: 0;
-}
-
-.radio .input:checked + .outer .inner {
-  -webkit-transform: scale(1);
-  -ms-transform: scale(1);
-  transform: scale(1);
-  opacity: 1;
-}
-
-.radio .input:checked + .outer {
-  border: 2px solid $brand-primary;
-}
-
-.radio .input:focus + .outer .inner {
-  -webkit-transform: scale(1);
-  -ms-transform: scale(1);
-  transform: scale(1);
-  opacity: 1;
-  background-color: $brand-primary;
-}
-
-.radio .outer {
-  width: 20px;
-  height: 20px;
-  display: block;
-  float: left;
-  margin: 10px 9px 10px 10px;
-  border: 2px solid $brand-primary;
-  border-radius: 50%;
-  background-color: #fff;
-}
-
-.radio .inner {
-  -webkit-transition: all 0.25s ease-in-out;
-  transition: all 0.25s ease-in-out;
-  width: 10px;
-  height: 10px;
-  -webkit-transform: scale(0);
-  -ms-transform: scale(0);
-  transform: scale(0);
-  display: block;
-  margin: 3px;
-  border-radius: 50%;
-  background-color: $brand-primary;
-  opacity: 0;
-}
diff --git a/src/components/ReadingModeToggle/index.js b/src/components/ReadingModeToggle/index.js
index d202bd684..76146bdaa 100644
--- a/src/components/ReadingModeToggle/index.js
+++ b/src/components/ReadingModeToggle/index.js
@@ -7,7 +7,7 @@ const ReadingModeToggle = ({ onToggle, isToggled }) => (
     icon={<i className="ss-icon ss-openbook vertical-align-middle" />}
     onClick={() => onToggle({ isReadingMode: !isToggled })}
   >
-    <LocaleFormattedMessage id="settings.reading" defaultMessage="Reading" />
+    <LocaleFormattedMessage id="setting.reading" defaultMessage="Reading" />
   </MenuItem>
 );
 
diff --git a/src/components/ReciterDropdown/index.js b/src/components/ReciterDropdown/index.js
index 96e602925..16d24735a 100644
--- a/src/components/ReciterDropdown/index.js
+++ b/src/components/ReciterDropdown/index.js
@@ -35,7 +35,9 @@ class ReciterDropdown extends Component {
       >
         <Radio
           checked={slug.id === audio}
-          id={slug.id} name="reciter" handleChange={() => onOptionChange({ audio: slug.id })}
+          id={slug.id}
+          name="reciter"
+          handleChange={() => onOptionChange({ audio: slug.id })}
         >
           {slug.reciterNameEng} {slug.style ? `(${slug.style})` : ''}
         </Radio>
diff --git a/src/components/TooltipDropdown/index.js b/src/components/TooltipDropdown/index.js
index 91ba5a59f..0f9d407be 100644
--- a/src/components/TooltipDropdown/index.js
+++ b/src/components/TooltipDropdown/index.js
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react';
-
-import Radio from 'components/Radio';
+import Menu, { MenuItem } from 'quran-components/lib/Menu';
+import Radio from 'quran-components/lib/Radio';
+import Icon from 'quran-components/lib/Icon';
 import LocaleFormattedMessage from 'components/LocaleFormattedMessage';
 
 const TooltipDropdown = ({ tooltip, onOptionChange }) => {
@@ -9,15 +10,29 @@ const TooltipDropdown = ({ tooltip, onOptionChange }) => {
   });
 
   const list = ['translation', 'transliteration'].map(type => (
-    <Radio key={type} id={type} name="type" checked={type === tooltip} handleChange={() => handleOptionChange(type)}>
-      <LocaleFormattedMessage id={`setting.tooltip.${type}`} defaultMessage={type.toUpperCase()} />
-    </Radio>
+    <MenuItem key={type}>
+      <Radio
+        id={type}
+        name="type"
+        checked={type === tooltip}
+        handleChange={() => handleOptionChange(type)}
+      >
+        <LocaleFormattedMessage id={`setting.tooltip.${type}`} defaultMessage={type.toUpperCase()} />
+      </Radio>
+    </MenuItem>
   ));
 
   return (
-    <div>
-      {list}
-    </div>
+    <MenuItem
+      icon={<Icon type="globe" />}
+      menu={
+        <Menu>
+          {list}
+        </Menu>
+      }
+    >
+      <LocaleFormattedMessage id="setting.tooltip.title" defaultMessage="Tooltip Content" />
+    </MenuItem>
   );
 };
 
diff --git a/yarn.lock b/yarn.lock
index 3371fa440..0090a1e5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7067,9 +7067,9 @@ querystringify@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
 
-quran-components@^0.0.65:
-  version "0.0.65"
-  resolved "https://registry.yarnpkg.com/quran-components/-/quran-components-0.0.65.tgz#39b81221d7c550079b019a24d507ce5c1dec011c"
+quran-components@^0.0.66:
+  version "0.0.66"
+  resolved "https://registry.yarnpkg.com/quran-components/-/quran-components-0.0.66.tgz#6ed563ee77b30365d910fd807be20e90d1e84c10"
   dependencies:
     react-icons "^2.2.3"
     react-tether "^0.5.6"