diff --git a/IconLoader b/IconLoader
index 4fcec24e32..c3312bd1ae 160000
--- a/IconLoader
+++ b/IconLoader
@@ -1 +1 @@
-Subproject commit 4fcec24e32031a44800b7706c3ec1fc54e90f8bb
+Subproject commit c3312bd1ae6ee1a8201eb4be5f24e97191ec18fe
diff --git a/lawnchair/.gitignore b/lawnchair/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/lawnchair/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/lawnchair/src/main/AndroidManifest.xml b/lawnchair/AndroidManifest.xml
similarity index 100%
rename from lawnchair/src/main/AndroidManifest.xml
rename to lawnchair/AndroidManifest.xml
diff --git a/lawnchair/build.gradle b/lawnchair/build.gradle
index 33b03707c4..1a3f0ca7bb 100644
--- a/lawnchair/build.gradle
+++ b/lawnchair/build.gradle
@@ -17,6 +17,14 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
+    sourceSets {
+        main {
+            res.srcDirs = ['res']
+            java.srcDirs = ['src']
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/lawnchair/consumer-rules.pro b/lawnchair/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lawnchair/proguard-rules.pro b/lawnchair/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/lawnchair/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
new file mode 100644
index 0000000000..021bc6aaf7
--- /dev/null
+++ b/lawnchair/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="derived_app_name" tools:override="true">Lawnchair</string>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/src/androidTest/java/ch/deletescape/lawnchair/ExampleInstrumentedTest.kt b/lawnchair/src/androidTest/java/ch/deletescape/lawnchair/ExampleInstrumentedTest.kt
deleted file mode 100644
index d256903500..0000000000
--- a/lawnchair/src/androidTest/java/ch/deletescape/lawnchair/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package ch.deletescape.lawnchair
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("ch.deletescape.lawnchair.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/lawnchair/src/test/java/ch/deletescape/lawnchair/ExampleUnitTest.kt b/lawnchair/src/test/java/ch/deletescape/lawnchair/ExampleUnitTest.kt
deleted file mode 100644
index 82c20eda86..0000000000
--- a/lawnchair/src/test/java/ch/deletescape/lawnchair/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package ch.deletescape.lawnchair
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 769d29838a..2b18472453 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -19,7 +19,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Application name -->
-    <string name="derived_app_name" translatable="false">Quickstep</string>
+<!--    <string name="derived_app_name" translatable="false">Quickstep</string>-->
 
     <!-- Options for recent tasks -->
     <!-- Title for an option to enter split screen mode for a given app -->
diff --git a/res/values/config.xml b/res/values/config.xml
index 75fcc907db..7ab6a60745 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -7,7 +7,7 @@
 
     <!-- A string pointer to the original app name string. This allows derived projects to
      easily override the app name without providing all translations -->
-    <string name="derived_app_name" translatable="false">@string/app_name</string>
+<!--    <string name="derived_app_name" translatable="false">@string/app_name</string>-->
 
     <!-- String representing the intent for search on the apps market. To specify a query, add
     q=<query> to the data to the intent -->