diff --git a/.gitmodules b/.gitmodules
index 09e1d5f5..771ec4a3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "scrambler"]
 	path = scrambler
 	url = https://gitlab.com/artectrex/scrambler.git
+[submodule "pixel_common"]
+	path = pixel_common
+	url = git@gitlab.shinice.net:pixeldroid/pixel_common.git
diff --git a/app/build.gradle b/app/build.gradle
index 2a688f3b..8adcf0aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,8 +91,9 @@ android {
     /**
      * Make a string with the application_id (available in xml etc)
      */
-    android.applicationVariants.all { variant ->
+    android.applicationVariants.configureEach { variant ->
         variant.resValue 'string', 'application_id', variant.applicationId
+        variant.resValue "string", "versionName", variant.versionName
     }
 
     testOptions {
@@ -210,6 +211,7 @@ dependencies {
 
     implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.4'
     implementation project(path: ':scrambler')
+    implementation project(path: ':pixel_common')
 
     implementation('com.github.bumptech.glide:glide:4.14.2') {
         exclude group: "com.android.support"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f346adb3..f7cf28d4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -157,17 +157,6 @@
         </activity>
         <activity android:name=".searchDiscover.TrendingActivity"
             android:theme="@style/BaseAppTheme.NoActionBar" />
-        <activity
-            android:name=".settings.AboutActivity"
-            android:parentActivityName=".settings.SettingsActivity"
-            android:theme="@style/BaseAppTheme.NoActionBar" />
-        <activity
-            android:name=".settings.LicenseActivity"
-            android:parentActivityName=".settings.AboutActivity"
-            android:screenOrientation="sensorPortrait"
-            tools:ignore="LockedOrientationActivity"
-            android:theme="@style/BaseAppTheme.NoActionBar" />
-
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt
deleted file mode 100644
index c06f71ed..00000000
--- a/app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.pixeldroid.app.settings
-
-import android.content.Intent
-import android.os.Bundle
-import org.pixeldroid.app.BuildConfig
-import org.pixeldroid.app.databinding.ActivityAboutBinding
-import org.pixeldroid.app.utils.ThemedActivity
-
-class AboutActivity : ThemedActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val binding = ActivityAboutBinding.inflate(layoutInflater)
-
-        setContentView(binding.root)
-        setSupportActionBar(binding.topBar)
-
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
-        binding.aboutVersionNumber.text = BuildConfig.VERSION_NAME
-        binding.licensesButton.setOnClickListener{
-            val intent = Intent(this, LicenseActivity::class.java)
-            startActivity(intent)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt
deleted file mode 100644
index 4dc847a3..00000000
--- a/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.pixeldroid.app.settings
-
-import android.os.Bundle
-import com.mikepenz.aboutlibraries.Libs
-import org.pixeldroid.app.R
-import org.pixeldroid.app.databinding.OpenSourceLicenseBinding
-import org.pixeldroid.app.utils.ThemedActivity
-
-/**
- * Displays licenses for all app dependencies. JSON is
- * generated by the plugin https://github.com/cookpad/LicenseToolsPlugin.
- */
-class LicenseActivity: ThemedActivity() {
-
-    private lateinit var binding: OpenSourceLicenseBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = OpenSourceLicenseBinding.inflate(layoutInflater)
-
-        setContentView(binding.root)
-        setSupportActionBar(binding.topBar)
-
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
-        setupRecyclerView()
-    }
-
-    private fun setupRecyclerView() {
-        val aboutLibsJson: String = applicationContext.resources.openRawResource(R.raw.aboutlibraries)
-            .bufferedReader().use { it.readText() }
-
-        val libs = Libs.Builder()
-            .withJson(aboutLibsJson)
-            .build()
-
-        val adapter = OpenSourceLicenseAdapter(libs)
-        binding.openSourceLicenseRecyclerView.adapter = adapter
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/pixeldroid/app/settings/OpenSourceLicenseAdapter.kt b/app/src/main/java/org/pixeldroid/app/settings/OpenSourceLicenseAdapter.kt
deleted file mode 100644
index ca485669..00000000
--- a/app/src/main/java/org/pixeldroid/app/settings/OpenSourceLicenseAdapter.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.pixeldroid.app.settings
-
-import android.annotation.SuppressLint
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.entity.Library
-import org.pixeldroid.app.databinding.OpenSourceItemBinding
-
-class OpenSourceLicenseAdapter(private val openSourceItems: Libs) :
-    RecyclerView.Adapter<OpenSourceLicenseAdapter.OpenSourceLicenceViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OpenSourceLicenceViewHolder
-        {
-            val itemBinding = OpenSourceItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            return OpenSourceLicenceViewHolder(itemBinding)
-        }
-
-    override fun onBindViewHolder(holder: OpenSourceLicenceViewHolder, position: Int) {
-        val item = openSourceItems.libraries[position]
-        holder.bind(item)
-    }
-
-    override fun getItemCount(): Int = openSourceItems.libraries.size
-
-    class OpenSourceLicenceViewHolder(val binding: OpenSourceItemBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        @SuppressLint("SetTextI18n")
-        fun bind(item: Library) {
-            with(binding) {
-                if (item.name.isNotEmpty()) {
-                    title.isVisible = true
-                    title.text = item.name
-                } else {
-                    title.isVisible = false
-                }
-                val license = item.licenses.firstOrNull()
-                val licenseName = license?.name ?: ""
-                val licenseUrl = license?.url?.let { " (${it} )" } ?: ""
-                copyright.isVisible = true
-                copyright.apply {
-                    text = "$licenseName$licenseUrl"
-                    movementMethod = LinkMovementMethod.getInstance()
-                }
-                url.isVisible = true
-                url.apply {
-                    text = "${item.developers.firstOrNull()?.name ?: ""} ${item.website}"
-                    movementMethod = LinkMovementMethod.getInstance()
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
index af4b331c..62159a11 100644
--- a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
@@ -17,7 +17,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.pixeldroid.app.MainActivity
 import org.pixeldroid.app.R
 import org.pixeldroid.app.databinding.SettingsBinding
-import org.pixeldroid.app.utils.ThemedActivity
+import org.pixeldroid.common.ThemedActivity
 import org.pixeldroid.app.utils.setThemeFromPreferences
 
 
diff --git a/app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt b/app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt
index 88839c28..cc8bd9db 100644
--- a/app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt
@@ -1,12 +1,11 @@
 package org.pixeldroid.app.utils
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import org.pixeldroid.app.utils.db.AppDatabase
 import org.pixeldroid.app.utils.di.PixelfedAPIHolder
 import javax.inject.Inject
 
-open class BaseActivity : ThemedActivity() {
+open class BaseActivity : org.pixeldroid.common.ThemedActivity() {
 
     @Inject
     lateinit var db: AppDatabase
diff --git a/app/src/main/java/org/pixeldroid/app/utils/ThemedActivity.kt b/app/src/main/java/org/pixeldroid/app/utils/ThemedActivity.kt
deleted file mode 100644
index 963e9fd2..00000000
--- a/app/src/main/java/org/pixeldroid/app/utils/ThemedActivity.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.pixeldroid.app.utils
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-
-open class ThemedActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        // Set theme when we chose one
-        themeNoActionBar()?.let { setTheme(it) }
-        super.onCreate(savedInstanceState)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/pixeldroid/app/utils/Utils.kt b/app/src/main/java/org/pixeldroid/app/utils/Utils.kt
index 69090468..14981b0d 100644
--- a/app/src/main/java/org/pixeldroid/app/utils/Utils.kt
+++ b/app/src/main/java/org/pixeldroid/app/utils/Utils.kt
@@ -161,30 +161,6 @@ fun setThemeFromPreferences(preferences: SharedPreferences, resources: Resources
     }
 }
 
-@StyleRes
-fun Context.themeNoActionBar(): Int? {
-    return when(PreferenceManager.getDefaultSharedPreferences(this).getInt("themeColor", 0)) {
-        // No theme was chosen: the user wants to use the system dynamic color (from wallpaper for example)
-        -1 -> null
-        1 -> R.style.AppTheme2_NoActionBar
-        2 -> R.style.AppTheme3_NoActionBar
-        3 -> R.style.AppTheme4_NoActionBar
-        else -> R.style.AppTheme5_NoActionBar
-    }
-}
-
-@StyleRes
-fun Context.themeActionBar(): Int? {
-    return when(PreferenceManager.getDefaultSharedPreferences(this).getInt("themeColor", 0)) {
-        // No theme was chosen: the user wants to use the system dynamic color (from wallpaper for example)
-        -1 -> null
-        1 -> R.style.AppTheme2
-        2 -> R.style.AppTheme3
-        3 -> R.style.AppTheme4
-        else -> R.style.AppTheme5
-    }
-}
-
 @ColorInt
 fun Context.getColorFromAttr(@AttrRes attrColor: Int): Int = MaterialColors.getColor(this, attrColor, Color.BLACK)
 
diff --git a/app/src/main/res/drawable/bug_report_black_24dp.xml b/app/src/main/res/drawable/bug_report_black_24dp.xml
deleted file mode 100644
index 3632a6af..00000000
--- a/app/src/main/res/drawable/bug_report_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"
-      android:fillColor="?attr/colorOnBackground"/>
-</vector>
diff --git a/app/src/main/res/drawable/translate_black_24dp.xml b/app/src/main/res/drawable/translate_black_24dp.xml
deleted file mode 100644
index cf62cd35..00000000
--- a/app/src/main/res/drawable/translate_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"
-      android:fillColor="?attr/colorOnBackground"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
deleted file mode 100644
index a719c030..00000000
--- a/app/src/main/res/layout/activity_about.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorSecondaryContainer"
-        android:fitsSystemWindows="true"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/top_bar"
-            app:title="@string/about_pixeldroid"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <ScrollView xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fadeScrollbars="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:context=".settings.AboutActivity">
-
-            <ImageView
-                android:id="@+id/imageView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:importantForAccessibility="no"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/mascot" />
-
-            <TextView
-                android:id="@+id/aboutAppName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="11dp"
-                android:text="@string/app_name"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-            <TextView
-                android:id="@+id/aboutVersionNumber"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/aboutAppName"
-                tools:text="v1.0.realversion" />
-
-            <TextView
-                android:id="@+id/aboutAppDescription"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
-                android:text="@string/license_info"
-                android:textAlignment="center"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/aboutVersionNumber" />
-
-            <TextView
-                android:id="@+id/aboutWebsite"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:autoLink="web"
-                android:text="@string/project_website"
-                android:textAlignment="center"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/aboutAppDescription" />
-
-            <TextView
-                android:id="@+id/contributeTranslationsText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:autoLink="web"
-                android:drawablePadding="6dp"
-                android:text="@string/help_translate"
-                android:textAlignment="center"
-                app:drawableLeftCompat="@drawable/translate_black_24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/aboutWebsite" />
-
-            <TextView
-                android:id="@+id/contributeTranslationsUrl"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:text="https://weblate.pixeldroid.org"
-                android:textAlignment="center"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/contributeTranslationsText"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/contributeForgeText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:autoLink="web"
-                android:drawablePadding="6dp"
-                android:text="@string/issues_contribute"
-                android:textAlignment="center"
-                app:drawableLeftCompat="@drawable/bug_report_black_24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/contributeTranslationsUrl" />
-
-            <TextView
-                android:id="@+id/contributeForgeUrl"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:text="https://gitlab.shinice.net/pixeldroid/PixelDroid"
-                android:textAlignment="center"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/contributeForgeText"
-                tools:ignore="HardcodedText" />
-
-            <Button
-                android:id="@+id/licensesButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:text="@string/dependencies_licenses"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/contributeForgeUrl" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </ScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/open_source_item.xml b/app/src/main/res/layout/open_source_item.xml
deleted file mode 100644
index d082ffc7..00000000
--- a/app/src/main/res/layout/open_source_item.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingHorizontal="@dimen/spacing_xlarge"
-  android:paddingBottom="@dimen/spacing_xlarge">
-
-  <TextView
-      android:id="@+id/title"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginVertical="@dimen/spacing_xlarge"
-      android:textSize="20sp"
-      android:textStyle="bold"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:layout_editor_absoluteX="24dp" />
-
-  <TextView
-      android:id="@+id/copyright"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginVertical="@dimen/spacing_large"
-      android:autoLink="web"
-      android:linksClickable="true"
-      app:layout_constraintTop_toBottomOf="@+id/title"
-      tools:layout_editor_absoluteX="24dp" />
-
-  <TextView
-      android:id="@+id/url"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/spacing_large"
-      android:autoLink="web"
-      android:linksClickable="true"
-      app:layout_constraintTop_toBottomOf="@+id/copyright"
-      tools:layout_editor_absoluteX="24dp" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/open_source_license.xml b/app/src/main/res/layout/open_source_license.xml
deleted file mode 100644
index 76d8b796..00000000
--- a/app/src/main/res/layout/open_source_license.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-     android:fitsSystemWindows="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:fitsSystemWindows="true"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorSecondaryContainer"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/top_bar"
-            app:title="@string/dependencies_licenses"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:background="?attr/colorSurface"
-        android:id="@+id/open_source_license_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fadeScrollbars="false"
-        android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index c7df4cde..471c5657 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress AndroidElementNotAllowed -->
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -48,7 +49,17 @@
         android:summary="@string/about_pixeldroid"
         app:icon="@drawable/info_black_24dp">
         <intent
+            android:action="android.intent.action.VIEW"
             android:targetPackage="@string/application_id"
-            android:targetClass="org.pixeldroid.app.settings.AboutActivity"/>
+            android:targetClass="org.pixeldroid.common.AboutActivity">
+            <extra android:name="buildVersion" android:value="@string/versionName" />
+            <extra android:name="appImage" android:value="@drawable/mascot" />
+            <extra android:name="appName" android:value="@string/app_name" />
+            <extra android:name="aboutAppDescription" android:value="@string/license_info" />
+            <extra android:name="website" android:value="@string/project_website" />
+            <extra android:name="translatePlatformUrl" android:value="https://weblate.pixeldroid.org" />
+            <extra android:name="contributeForgeUrl" android:value="https://gitlab.shinice.net/pixeldroid/PixelDroid" />
+        </intent>
+
     </Preference>
 </PreferenceScreen>
diff --git a/pixel_common b/pixel_common
new file mode 160000
index 00000000..2c9c19a3
--- /dev/null
+++ b/pixel_common
@@ -0,0 +1 @@
+Subproject commit 2c9c19a3060fed241531f1448eea7dec36411279
diff --git a/settings.gradle b/settings.gradle
index 706f76d9..389084f8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name='PixelDroid'
 include ':app'
 include ':scrambler'
-project(':scrambler').projectDir = new File(rootDir, 'scrambler/scrambler/')
\ No newline at end of file
+project(':scrambler').projectDir = new File(rootDir, 'scrambler/scrambler/')
+include ':pixel_common'