diff --git a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java
index 8a90352..eea7094 100644
--- a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java
+++ b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java
@@ -4,7 +4,11 @@
 package acr.browser.lightning.activity;
 
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +22,19 @@ public class SettingsActivity extends ThemableSettingsActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // TODO: set up ToolBar
+        // this is a workaround for the Toolbar in PreferenceActitivty
+        ViewGroup root = (ViewGroup) findViewById(android.R.id.content);
+        LinearLayout content = (LinearLayout) root.getChildAt(0);
+        LinearLayout toolbarContainer = (LinearLayout) View.inflate(this, R.layout.toolbar_settings, null);
+
+        root.removeAllViews();
+        toolbarContainer.addView(content);
+        root.addView(toolbarContainer);
+
+        // now we can set the Toolbar using AppCompatPreferenceActivity
+        Toolbar toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
     @Override
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
deleted file mode 100644
index 2d2454f..0000000
--- a/app/src/main/res/layout/settings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar_settings" />
-
-    <fragment
-        android:name="acr.browser.lightning.fragment.GeneralSettingsFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:tag="settingsFragment" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_settings.xml b/app/src/main/res/layout/toolbar_settings.xml
index bf3cf82..ba0f63a 100644
--- a/app/src/main/res/layout/toolbar_settings.xml
+++ b/app/src/main/res/layout/toolbar_settings.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="?toolbarSettingsBackground"
-    android:elevation="2dp"
-    android:minHeight="?attr/actionBarSize"
-    custom:contentInsetEnd="0dp"
-    custom:contentInsetStart="0dp" />
+    android:layout_height="wrap_content">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?toolbarSettingsBackground"
+        android:elevation="2dp"
+        android:minHeight="?attr/actionBarSize"
+        custom:contentInsetEnd="0dp"
+        custom:contentInsetStart="0dp" />
+
+</LinearLayout>
\ No newline at end of file