diff --git a/components/app.js b/components/app.js
index 4953678..6ae3e86 100644
--- a/components/app.js
+++ b/components/app.js
@@ -63,7 +63,6 @@ class App extends Component {
     const pageProps = {
       cycleDay: date && getCycleDay(date),
       date,
-      handleBackButtonPress: goBack,
     }
 
     return (
diff --git a/components/cycle-day/symptoms/bleeding.js b/components/cycle-day/symptoms/bleeding.js
index a8ae709..f0579c1 100644
--- a/components/cycle-day/symptoms/bleeding.js
+++ b/components/cycle-day/symptoms/bleeding.js
@@ -14,7 +14,6 @@ class Bleeding extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -54,7 +53,6 @@ class Bleeding extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/cervix.js b/components/cycle-day/symptoms/cervix.js
index 18513c6..9966d71 100644
--- a/components/cycle-day/symptoms/cervix.js
+++ b/components/cycle-day/symptoms/cervix.js
@@ -14,7 +14,6 @@ class Cervix extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -62,7 +61,6 @@ class Cervix extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/desire.js b/components/cycle-day/symptoms/desire.js
index b6567dc..1898366 100644
--- a/components/cycle-day/symptoms/desire.js
+++ b/components/cycle-day/symptoms/desire.js
@@ -13,7 +13,6 @@ class Desire extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -50,7 +49,6 @@ class Desire extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/mood.js b/components/cycle-day/symptoms/mood.js
index 6bd34da..228d2ce 100644
--- a/components/cycle-day/symptoms/mood.js
+++ b/components/cycle-day/symptoms/mood.js
@@ -13,7 +13,6 @@ class Mood extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -64,7 +63,6 @@ class Mood extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/mucus.js b/components/cycle-day/symptoms/mucus.js
index 0307452..2a57362 100644
--- a/components/cycle-day/symptoms/mucus.js
+++ b/components/cycle-day/symptoms/mucus.js
@@ -15,7 +15,6 @@ class Mucus extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -63,7 +62,6 @@ class Mucus extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/note.js b/components/cycle-day/symptoms/note.js
index 158ae0b..17cfef1 100644
--- a/components/cycle-day/symptoms/note.js
+++ b/components/cycle-day/symptoms/note.js
@@ -39,7 +39,6 @@ class Note extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/pain.js b/components/cycle-day/symptoms/pain.js
index 9dd1e2c..218eb38 100644
--- a/components/cycle-day/symptoms/pain.js
+++ b/components/cycle-day/symptoms/pain.js
@@ -14,7 +14,6 @@ class Pain extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -65,7 +64,6 @@ class Pain extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/sex.js b/components/cycle-day/symptoms/sex.js
index d4dd170..5cb636e 100644
--- a/components/cycle-day/symptoms/sex.js
+++ b/components/cycle-day/symptoms/sex.js
@@ -14,7 +14,6 @@ class Sex extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -65,7 +64,6 @@ class Sex extends Component {
       <SymptomView
         symptom={this.symptom}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/cycle-day/symptoms/symptom-view.js b/components/cycle-day/symptoms/symptom-view.js
index a84d93d..82bb86b 100644
--- a/components/cycle-day/symptoms/symptom-view.js
+++ b/components/cycle-day/symptoms/symptom-view.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'
 
 import { connect } from 'react-redux'
 import { getDate } from '../../../slices/date'
+import { goBack } from '../../../slices/navigation'
 
 import { saveSymptom } from '../../../db'
 import formatDate from '../../helpers/format-date'
@@ -27,8 +28,8 @@ class SymptomView extends Component {
     symptom: PropTypes.string.isRequired,
     values: PropTypes.object,
     date: PropTypes.string,
-    handleBackButtonPress: PropTypes.func,
     children: PropTypes.node,
+    goBack: PropTypes.func,
   }
 
   constructor(props) {
@@ -52,7 +53,7 @@ class SymptomView extends Component {
 
   onDeleteConfirmation = () => {
     this.deleteSymptomEntry()
-    this.props.handleBackButtonPress()
+    this.props.goBack()
   }
 
   showConfirmationAlert = () => {
@@ -75,13 +76,13 @@ class SymptomView extends Component {
   }
 
   render() {
-    const { symptom, date } = this.props
+    const { symptom, date, goBack } = this.props
     return (
       <View style={{flex: 1}}>
         <Header
           title={headerTitles[symptom]}
           subtitle={formatDate(date)}
-          handleBack={this.props.handleBackButtonPress}
+          handleBack={goBack}
           handleDelete={
             this.state.shouldShowDelete && this.showConfirmationAlert
           }
@@ -99,11 +100,17 @@ class SymptomView extends Component {
 
 const mapStateToProps = (state) => {
   return({
-    date: getDate(state)
+    date: getDate(state),
+  })
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return({
+    goBack: () => dispatch(goBack()),
   })
 }
 
 export default connect(
   mapStateToProps,
-  null
+  mapDispatchToProps,
 )(SymptomView)
diff --git a/components/cycle-day/symptoms/temperature.js b/components/cycle-day/symptoms/temperature.js
index f735001..5c033c9 100644
--- a/components/cycle-day/symptoms/temperature.js
+++ b/components/cycle-day/symptoms/temperature.js
@@ -20,7 +20,6 @@ class Temperature extends Component {
 
   static propTypes = {
     cycleDay: PropTypes.object,
-    handleBackButtonPress: PropTypes.func,
     date: PropTypes.string.isRequired,
   }
 
@@ -90,7 +89,6 @@ class Temperature extends Component {
       <SymptomView
         symptom={'temperature'}
         values={this.state}
-        handleBackButtonPress={this.props.handleBackButtonPress}
         date={this.props.date}
       >
         <SymptomSection
diff --git a/components/home.js b/components/home.js
index 0b300cb..2b900d5 100644
--- a/components/home.js
+++ b/components/home.js
@@ -30,11 +30,10 @@ class Home extends Component {
   static propTypes = {
     navigate: PropTypes.func,
     setDate: PropTypes.func,
-    // The following three is not being used,
+    // The following are not being used,
     // we could see if it's possible to not pass them from the <App />
     cycleDay: PropTypes.object,
     date: PropTypes.string,
-    handleBackButtonPress: PropTypes.func,
   }
 
   constructor(props) {