diff --git a/components/settings/password/index.js b/components/settings/password/index.js
index f5741e3f372027f471bba9687a25501753edc193..e263cae49c9eff8833935c6905e50d2850c21cbc 100644
--- a/components/settings/password/index.js
+++ b/components/settings/password/index.js
@@ -3,6 +3,7 @@ import { View, ScrollView } from 'react-native'
 import CreatePassword from './create'
 import ChangePassword from './update'
 import DeletePassword from './delete'
+import SettingsSegment from '../settings-segment'
 import AppText from '../../app-text'
 import {
   hasEncryptionObservable
@@ -22,11 +23,7 @@ export default class PasswordSetting extends Component {
   render() {
     return (
       <ScrollView>
-        <View style={styles.settingsSegment}>
-
-          <AppText style={styles.settingsSegmentTitle}>
-            {labels.passwordSettings.title}
-          </AppText>
+        <SettingsSegment title={labels.passwordSettings.title}>
 
           {this.state.showUpdateAndDelete ?
             <AppText>{labels.passwordSettings.explainerEnabled}</AppText>
@@ -45,7 +42,7 @@ export default class PasswordSetting extends Component {
           <CreatePassword/>
           }
 
-        </View>
+        </SettingsSegment>
       </ScrollView>
     )
   }