diff --git a/Hyperrail/src/main/java/be/hyperrail/android/FeedbackFragment.java b/Hyperrail/src/main/java/be/hyperrail/android/FeedbackFragment.java
index ec893ae6..97767ee7 100644
--- a/Hyperrail/src/main/java/be/hyperrail/android/FeedbackFragment.java
+++ b/Hyperrail/src/main/java/be/hyperrail/android/FeedbackFragment.java
@@ -15,6 +15,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -39,6 +40,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        final EditText vFeedbackText = ((EditText) view.findViewById(R.id.input_text));
 
         view.findViewById(R.id.button_send).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -58,6 +60,7 @@ public void onClick(View view) {
                 feedbackEmail.setType("text/email");
                 feedbackEmail.putExtra(Intent.EXTRA_EMAIL, new String[]{"feedback@hyperrail.be"});
                 feedbackEmail.putExtra(Intent.EXTRA_SUBJECT, "Feedback for hyperrail " + version);
+                feedbackEmail.putExtra(Intent.EXTRA_TEXT, vFeedbackText.getText());
                 startActivity(Intent.createChooser(feedbackEmail, "Send feedback mail:"));
             }
         });
diff --git a/Hyperrail/src/main/res/layout/fragment_feedback.xml b/Hyperrail/src/main/res/layout/fragment_feedback.xml
index 23dc9d5c..d0b9234a 100644
--- a/Hyperrail/src/main/res/layout/fragment_feedback.xml
+++ b/Hyperrail/src/main/res/layout/fragment_feedback.xml
@@ -7,6 +7,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:layout_marginLeft="@dimen/activity_horizontal_margin"
+              android:layout_marginRight="@dimen/activity_horizontal_margin"
+              android:layout_marginTop="@dimen/activity_vertical_margin"
+              android:layout_marginBottom="@dimen/activity_vertical_margin"
               android:orientation="vertical">
 
     <TextView
@@ -15,6 +19,7 @@
         android:text="@string/feedback_explanation"/>
 
     <EditText
+        android:id="@+id/input_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/Hyperrail/src/main/res/menu/drawer_main.xml b/Hyperrail/src/main/res/menu/drawer_main.xml
index 7624a3cc..4fcd2080 100644
--- a/Hyperrail/src/main/res/menu/drawer_main.xml
+++ b/Hyperrail/src/main/res/menu/drawer_main.xml
@@ -21,7 +21,7 @@
 
     <item android:id="@+id/action_settings"
           android:title="@string/title_activity_settings"
-          android:icon="@android:drawable/ic_menu_preferences"
+          android:icon="@drawable/ic_settings_white"
           app:showAsAction="ifRoom|collapseActionView" />
 
     <item android:id="@+id/action_feedback"