diff --git a/app/build.gradle b/app/build.gradle
index b60f3ca6..9495967d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,6 +116,7 @@ dependencies {
   implementation project(':data')
   implementation project(':homescreen')
   implementation project(':intro')
+  implementation project(':preferred-apps')
   implementation project(':redirect')
   implementation project(':resolver')
 
diff --git a/preferred-apps/build.gradle b/preferred-apps/build.gradle
new file mode 100644
index 00000000..a21f883d
--- /dev/null
+++ b/preferred-apps/build.gradle
@@ -0,0 +1,6 @@
+apply from: configFile('android-library-config.gradle')
+
+dependencies {
+    implementation project(':resolver')
+    implementation project(':data')
+}
\ No newline at end of file
diff --git a/preferred-apps/src/main/AndroidManifest.xml b/preferred-apps/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..ac520199
--- /dev/null
+++ b/preferred-apps/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tasomaniac.openwith.preferred">
+
+    <application android:supportsRtl="true" />
+
+</manifest>
diff --git a/app/src/main/java/com/tasomaniac/openwith/preferred/AppRemoveDialogFragment.kt b/preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/AppRemoveDialogFragment.kt
similarity index 98%
rename from app/src/main/java/com/tasomaniac/openwith/preferred/AppRemoveDialogFragment.kt
rename to preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/AppRemoveDialogFragment.kt
index 57fd4414..cf14f51f 100644
--- a/app/src/main/java/com/tasomaniac/openwith/preferred/AppRemoveDialogFragment.kt
+++ b/preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/AppRemoveDialogFragment.kt
@@ -7,7 +7,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
-import com.tasomaniac.openwith.R
 import com.tasomaniac.openwith.resolver.DisplayActivityInfo
 
 class AppRemoveDialogFragment : AppCompatDialogFragment() {
diff --git a/app/src/main/java/com/tasomaniac/openwith/preferred/PreferredAppsActivity.kt b/preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/PreferredAppsActivity.kt
similarity index 94%
rename from app/src/main/java/com/tasomaniac/openwith/preferred/PreferredAppsActivity.kt
rename to preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/PreferredAppsActivity.kt
index d880f7ad..1d0437ab 100644
--- a/app/src/main/java/com/tasomaniac/openwith/preferred/PreferredAppsActivity.kt
+++ b/preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/PreferredAppsActivity.kt
@@ -8,7 +8,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.tasomaniac.openwith.HeaderAdapter
-import com.tasomaniac.openwith.R
 import com.tasomaniac.openwith.SimpleTextViewHolder
 import com.tasomaniac.openwith.data.Analytics
 import com.tasomaniac.openwith.data.PreferredApp
@@ -22,9 +21,7 @@ import dagger.android.support.DaggerAppCompatActivity
 import io.reactivex.Completable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.addTo
-import kotlinx.android.synthetic.main.activity_preferred_apps.toolbar
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.activity_preferred_apps.recycler_view as recyclerView
 
 class PreferredAppsActivity : DaggerAppCompatActivity(), ItemClickListener, AppRemoveDialogFragment.Callbacks {
 
@@ -36,11 +33,13 @@ class PreferredAppsActivity : DaggerAppCompatActivity(), ItemClickListener, AppR
 
     private val disposables = CompositeDisposable()
 
+    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recycler_view) }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_preferred_apps)
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(findViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
         recyclerView.layoutManager = LinearLayoutManager(this)
diff --git a/app/src/main/java/com/tasomaniac/openwith/preferred/PreferredAppsAdapter.kt b/preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/PreferredAppsAdapter.kt
similarity index 100%
rename from app/src/main/java/com/tasomaniac/openwith/preferred/PreferredAppsAdapter.kt
rename to preferred-apps/src/main/kotlin/com/tasomaniac/openwith/preferred/PreferredAppsAdapter.kt
diff --git a/app/src/main/res/layout/activity_preferred_apps.xml b/preferred-apps/src/main/res/layout/activity_preferred_apps.xml
similarity index 100%
rename from app/src/main/res/layout/activity_preferred_apps.xml
rename to preferred-apps/src/main/res/layout/activity_preferred_apps.xml
diff --git a/app/src/main/res/layout/preferred_header.xml b/preferred-apps/src/main/res/layout/preferred_header.xml
similarity index 100%
rename from app/src/main/res/layout/preferred_header.xml
rename to preferred-apps/src/main/res/layout/preferred_header.xml
diff --git a/settings.gradle b/settings.gradle
index ae63d328..86ecbdde 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,6 +8,7 @@ include ':data'
 include ':homescreen'
 include ':intro'
 include ':intro-lib'
+include ':preferred-apps'
 include ':redirect'
 include ':resolver'
 include ':test-support'