diff --git a/components/common/framed-segment.js b/components/common/segment.js
similarity index 79%
rename from components/common/framed-segment.js
rename to components/common/segment.js
index b20b871..beb7a67 100644
--- a/components/common/framed-segment.js
+++ b/components/common/segment.js
@@ -6,21 +6,20 @@ import AppText from './app-text'
 
 import { Containers, Typography } from '../../styles/redesign'
 
-const FramedSegment = ({ children, last, style, title }) => {
+const Segment = ({ children, last, title }) => {
   const containerStyle = last ? styles.containerLast : styles.container
 
   return (
-    <View style={[containerStyle, style]}>
+    <View style={containerStyle}>
       {title && <AppText style={styles.title}>{title}</AppText>}
       {children}
     </View>
   )
 }
 
-FramedSegment.propTypes = {
+Segment.propTypes = {
   children: PropTypes.node,
   last: PropTypes.bool,
-  style: PropTypes.object,
   title: PropTypes.string
 }
 
@@ -38,4 +37,4 @@ const styles = StyleSheet.create({
   }
 })
 
-export default FramedSegment
+export default Segment
diff --git a/components/settings/about.js b/components/settings/about.js
index 89b37d5..ea2fc96 100644
--- a/components/settings/about.js
+++ b/components/settings/about.js
@@ -2,7 +2,7 @@ import React from 'react'
 
 import AppPage from '../common/app-page'
 import AppText from '../common/app-text'
-import FramedSegment from '../common/framed-segment'
+import Segment from '../common/segment'
 
 import labels from '../../i18n/en/settings'
 import links from '../../i18n/en/links'
@@ -10,24 +10,24 @@ import links from '../../i18n/en/links'
 const AboutSection = () => {
   return (
     <AppPage title={labels.aboutSection.title} >
-      <FramedSegment>
+      <Segment>
         <AppText>{labels.aboutSection.text}</AppText>
-      </FramedSegment>
-      <FramedSegment title={labels.philosophy.title}>
+      </Segment>
+      <Segment title={labels.philosophy.title}>
         <AppText>{labels.philosophy.text}</AppText>
-      </FramedSegment>
-      <FramedSegment title={labels.credits.title}>
+      </Segment>
+      <Segment title={labels.credits.title}>
         <AppText>{labels.credits.note}</AppText>
-      </FramedSegment>
-      <FramedSegment title={labels.donate.title}>
+      </Segment>
+      <Segment title={labels.donate.title}>
         <AppText>{labels.donate.note}</AppText>
-      </FramedSegment>
-      <FramedSegment title={labels.website.title}>
+      </Segment>
+      <Segment title={labels.website.title}>
         <AppText>{links.website.url}</AppText>
-      </FramedSegment>
-      <FramedSegment title={labels.version.title} last>
+      </Segment>
+      <Segment title={labels.version.title} last>
         <AppText>{require('../../package.json').version}</AppText>
-      </FramedSegment>
+      </Segment>
     </AppPage>
   )
 }
diff --git a/components/settings/data-management/index.js b/components/settings/data-management/index.js
index ff67c4d..558bdfd 100644
--- a/components/settings/data-management/index.js
+++ b/components/settings/data-management/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { ScrollView, View } from 'react-native'
 import AppText from '../../common/app-text'
-import FramedSegment from '../../common/framed-segment'
+import Segment from '../../common/segment'
 import AppLoadingView from '../../common/app-loading'
 import SettingsButton from '../shared/settings-button'
 import { openImportDialog, getFileContent, importData } from './import-dialog'
@@ -58,21 +58,21 @@ export default class DataManagement extends Component {
         {!this.state.isLoading &&
           <ScrollView>
             <View>
-              <FramedSegment title={labels.export.button}>
+              <Segment title={labels.export.button}>
                 <AppText>{labels.export.segmentExplainer}</AppText>
                 <SettingsButton onPress={this.startExport}>
                   {labels.export.button}
                 </SettingsButton>
-              </FramedSegment>
-              <FramedSegment title={labels.import.button}>
+              </Segment>
+              <Segment title={labels.import.button}>
                 <AppText>{labels.import.segmentExplainer}</AppText>
                 <SettingsButton
                   onPress= {this.startImport}
                 >
                   {labels.import.button}
                 </SettingsButton>
-              </FramedSegment>
-              <FramedSegment
+              </Segment>
+              <Segment
                 title={labels.deleteSegment.title}
                 last
               >
@@ -81,7 +81,7 @@ export default class DataManagement extends Component {
                   isDeletingData = { currentAction === 'delete' }
                   onStartDeletion = {() => this.setCurrentAction('delete')}
                 />
-              </FramedSegment>
+              </Segment>
             </View>
           </ScrollView>
         }
diff --git a/components/settings/license.js b/components/settings/license.js
index 20e3171..bb06823 100644
--- a/components/settings/license.js
+++ b/components/settings/license.js
@@ -2,16 +2,16 @@ import React from 'react'
 
 import AppPage from '../common/app-page'
 import AppText from '../common/app-text'
-import FramedSegment from '../common/framed-segment'
+import Segment from '../common/segment'
 
 import labels from '../../i18n/en/settings'
 
 const License = () => {
   return (
     <AppPage title={labels.license.title} >
-      <FramedSegment last >
+      <Segment last >
         <AppText>{labels.license.text}</AppText>
-      </FramedSegment>
+      </Segment>
     </AppPage>
   )
 }
diff --git a/components/settings/nfp-settings/index.js b/components/settings/nfp-settings/index.js
index 2c077bb..0857c16 100644
--- a/components/settings/nfp-settings/index.js
+++ b/components/settings/nfp-settings/index.js
@@ -5,7 +5,7 @@ import {
 import styles from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import AppText from '../../common/app-text'
-import FramedSegment from '../../common/framed-segment'
+import Segment from '../../common/segment'
 import TempSlider from './temp-slider'
 import UseCervixSetting from './use-cervix'
 import Icon from 'react-native-vector-icons/Entypo'
@@ -19,20 +19,20 @@ export default class Settings extends Component {
   render() {
     return (
       <ScrollView>
-        <FramedSegment title={labels.useCervix.title}>
+        <Segment title={labels.useCervix.title}>
           <UseCervixSetting/>
-        </FramedSegment>
-        <FramedSegment title={labels.tempScale.segmentTitle}>
+        </Segment>
+        <Segment title={labels.tempScale.segmentTitle}>
           <AppText>{labels.tempScale.segmentExplainer}</AppText>
           <TempSlider/>
-        </FramedSegment>
-        <FramedSegment style={styles.framedSegmentLast} >
+        </Segment>
+        <Segment style={styles.framedSegmentLast} >
           <View style={{flexDirection: 'row', alignItems: 'center'}}>
             <Icon name="info-with-circle"/>
             <AppText style={styles.framedSegmentTitle}>{` ${labels.preOvu.title} `}</AppText>
           </View>
           <AppText>{labels.preOvu.note}</AppText>
-        </FramedSegment>
+        </Segment>
       </ScrollView>
     )
   }
diff --git a/components/settings/password/index.js b/components/settings/password/index.js
index 0c874e2..933cada 100644
--- a/components/settings/password/index.js
+++ b/components/settings/password/index.js
@@ -3,7 +3,7 @@ import { ScrollView } from 'react-native'
 import CreatePassword from './create'
 import ChangePassword from './update'
 import DeletePassword from './delete'
-import FramedSegment from '../../common/framed-segment'
+import Segment from '../../common/segment'
 import AppText from '../../common/app-text'
 import {
   hasEncryptionObservable
@@ -52,7 +52,7 @@ export default class PasswordSetting extends Component {
 
     return (
       <ScrollView>
-        <FramedSegment title={title}>
+        <Segment title={title}>
           <AppText>
             { isPasswordSet ? explainerEnabled : explainerDisabled }
           </AppText>
@@ -72,7 +72,7 @@ export default class PasswordSetting extends Component {
               onCancelDelete = {this.onCancelDeletingPassword}
             />
           )}
-        </FramedSegment>
+        </Segment>
       </ScrollView>
     )
   }
diff --git a/components/settings/reminders/index.js b/components/settings/reminders/index.js
index 10c844a..7c35a14 100644
--- a/components/settings/reminders/index.js
+++ b/components/settings/reminders/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import {
   ScrollView,
 } from 'react-native'
-import FramedSegment from '../../common/framed-segment'
+import Segment from '../../common/segment'
 import TempReminderPicker from './temp-reminder-picker'
 import PeriodReminderPicker from './period-reminder'
 
@@ -17,12 +17,12 @@ export default class Settings extends Component {
   render() {
     return (
       <ScrollView>
-        <FramedSegment title={labels.tempReminder.title}>
+        <Segment title={labels.tempReminder.title}>
           <TempReminderPicker/>
-        </FramedSegment>
-        <FramedSegment title={labels.periodReminder.title}>
+        </Segment>
+        <Segment title={labels.periodReminder.title}>
           <PeriodReminderPicker/>
-        </FramedSegment>
+        </Segment>
       </ScrollView>
     )
   }
diff --git a/components/stats.js b/components/stats.js
index 3cae29b..a89ddcc 100644
--- a/components/stats.js
+++ b/components/stats.js
@@ -9,7 +9,7 @@ import cycleModule from '../lib/cycle'
 import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length'
 import {stats as labels} from '../i18n/en/labels'
 import AppText from './common/app-text'
-import FramedSegment from './common/framed-segment'
+import Segment from './common/segment'
 
 export default class Stats extends Component {
   render() {
@@ -25,7 +25,7 @@ export default class Stats extends Component {
     }
     return (
       <ScrollView>
-        <FramedSegment
+        <Segment
           style={styles.framedSegmentLast}
           title={labels.cycleLengthTitle}
         >
@@ -70,7 +70,7 @@ export default class Stats extends Component {
               <AppText>{labels.basisOfStatsEnd}</AppText>
             </View>
           </View>}
-        </FramedSegment>
+        </Segment>
       </ScrollView>
     )
   }