diff --git a/app/build.gradle b/app/build.gradle
index bed83bfe5..d5a6eb523 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,11 +129,9 @@ dependencies {
     // Password generator
     implementation 'me.gosimple:nbvcxz:1.5.0'
     
+    // Modules import
     implementation project(path: ':database')
-
-    // Icon pack
-    implementation project(path: ':icon-pack-classic')
-    implementation project(path: ':icon-pack-material')
+    implementation project(path: ':icon-pack')
 
     // Tests
     androidTestImplementation "androidx.test:runner:$android_test_version"
diff --git a/database/build.gradle b/database/build.gradle
index 655372a68..9f5ef653f 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -38,5 +38,5 @@ dependencies {
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'commons-codec:commons-codec:1.15'
 
-    implementation project(path: ':crypto')
+    implementation project(path: ':database:crypto')
 }
diff --git a/crypto/.gitignore b/database/crypto/.gitignore
similarity index 100%
rename from crypto/.gitignore
rename to database/crypto/.gitignore
diff --git a/crypto/build.gradle b/database/crypto/build.gradle
similarity index 100%
rename from crypto/build.gradle
rename to database/crypto/build.gradle
diff --git a/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt b/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
similarity index 100%
rename from crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
rename to database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
diff --git a/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt b/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
similarity index 100%
rename from crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
rename to database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
diff --git a/crypto/src/main/AndroidManifest.xml b/database/crypto/src/main/AndroidManifest.xml
similarity index 100%
rename from crypto/src/main/AndroidManifest.xml
rename to database/crypto/src/main/AndroidManifest.xml
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
similarity index 100%
rename from crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
rename to database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
diff --git a/crypto/src/main/jni/.gitignore b/database/crypto/src/main/jni/.gitignore
similarity index 100%
rename from crypto/src/main/jni/.gitignore
rename to database/crypto/src/main/jni/.gitignore
diff --git a/crypto/src/main/jni/CMakeLists.txt b/database/crypto/src/main/jni/CMakeLists.txt
similarity index 100%
rename from crypto/src/main/jni/CMakeLists.txt
rename to database/crypto/src/main/jni/CMakeLists.txt
diff --git a/crypto/src/main/jni/aes/CMakeLists.txt b/database/crypto/src/main/jni/aes/CMakeLists.txt
similarity index 100%
rename from crypto/src/main/jni/aes/CMakeLists.txt
rename to database/crypto/src/main/jni/aes/CMakeLists.txt
diff --git a/crypto/src/main/jni/aes/aes/aes.h b/database/crypto/src/main/jni/aes/aes/aes.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes.h
rename to database/crypto/src/main/jni/aes/aes/aes.h
diff --git a/crypto/src/main/jni/aes/aes/aes.txt b/database/crypto/src/main/jni/aes/aes/aes.txt
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes.txt
rename to database/crypto/src/main/jni/aes/aes/aes.txt
diff --git a/crypto/src/main/jni/aes/aes/aes_amd64.asm b/database/crypto/src/main/jni/aes/aes/aes_amd64.asm
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes_amd64.asm
rename to database/crypto/src/main/jni/aes/aes/aes_amd64.asm
diff --git a/crypto/src/main/jni/aes/aes/aes_modes.c b/database/crypto/src/main/jni/aes/aes/aes_modes.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes_modes.c
rename to database/crypto/src/main/jni/aes/aes/aes_modes.c
diff --git a/crypto/src/main/jni/aes/aes/aes_via_ace.h b/database/crypto/src/main/jni/aes/aes/aes_via_ace.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes_via_ace.h
rename to database/crypto/src/main/jni/aes/aes/aes_via_ace.h
diff --git a/crypto/src/main/jni/aes/aes/aes_x86_v1.asm b/database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes_x86_v1.asm
rename to database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
diff --git a/crypto/src/main/jni/aes/aes/aes_x86_v2.asm b/database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aes_x86_v2.asm
rename to database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
diff --git a/crypto/src/main/jni/aes/aes/aescpp.h b/database/crypto/src/main/jni/aes/aes/aescpp.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aescpp.h
rename to database/crypto/src/main/jni/aes/aes/aescpp.h
diff --git a/crypto/src/main/jni/aes/aes/aescrypt.c b/database/crypto/src/main/jni/aes/aes/aescrypt.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aescrypt.c
rename to database/crypto/src/main/jni/aes/aes/aescrypt.c
diff --git a/crypto/src/main/jni/aes/aes/aeskey.c b/database/crypto/src/main/jni/aes/aes/aeskey.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aeskey.c
rename to database/crypto/src/main/jni/aes/aes/aeskey.c
diff --git a/crypto/src/main/jni/aes/aes/aesopt.h b/database/crypto/src/main/jni/aes/aes/aesopt.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aesopt.h
rename to database/crypto/src/main/jni/aes/aes/aesopt.h
diff --git a/crypto/src/main/jni/aes/aes/aestab.c b/database/crypto/src/main/jni/aes/aes/aestab.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aestab.c
rename to database/crypto/src/main/jni/aes/aes/aestab.c
diff --git a/crypto/src/main/jni/aes/aes/aestab.h b/database/crypto/src/main/jni/aes/aes/aestab.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aestab.h
rename to database/crypto/src/main/jni/aes/aes/aestab.h
diff --git a/crypto/src/main/jni/aes/aes/aesxam.c b/database/crypto/src/main/jni/aes/aes/aesxam.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/aesxam.c
rename to database/crypto/src/main/jni/aes/aes/aesxam.c
diff --git a/crypto/src/main/jni/aes/aes/brg_endian.h b/database/crypto/src/main/jni/aes/aes/brg_endian.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/brg_endian.h
rename to database/crypto/src/main/jni/aes/aes/brg_endian.h
diff --git a/crypto/src/main/jni/aes/aes/brg_types.h b/database/crypto/src/main/jni/aes/aes/brg_types.h
similarity index 100%
rename from crypto/src/main/jni/aes/aes/brg_types.h
rename to database/crypto/src/main/jni/aes/aes/brg_types.h
diff --git a/crypto/src/main/jni/aes/aes/rfc3686.c b/database/crypto/src/main/jni/aes/aes/rfc3686.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/rfc3686.c
rename to database/crypto/src/main/jni/aes/aes/rfc3686.c
diff --git a/crypto/src/main/jni/aes/aes/tablegen.c b/database/crypto/src/main/jni/aes/aes/tablegen.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes/tablegen.c
rename to database/crypto/src/main/jni/aes/aes/tablegen.c
diff --git a/crypto/src/main/jni/aes/aes/vb.txt b/database/crypto/src/main/jni/aes/aes/vb.txt
similarity index 100%
rename from crypto/src/main/jni/aes/aes/vb.txt
rename to database/crypto/src/main/jni/aes/aes/vb.txt
diff --git a/crypto/src/main/jni/aes/aes/vbaxam.doc b/database/crypto/src/main/jni/aes/aes/vbaxam.doc
similarity index 100%
rename from crypto/src/main/jni/aes/aes/vbaxam.doc
rename to database/crypto/src/main/jni/aes/aes/vbaxam.doc
diff --git a/crypto/src/main/jni/aes/aes/via_ace.txt b/database/crypto/src/main/jni/aes/aes/via_ace.txt
similarity index 100%
rename from crypto/src/main/jni/aes/aes/via_ace.txt
rename to database/crypto/src/main/jni/aes/aes/via_ace.txt
diff --git a/crypto/src/main/jni/aes/aes_jni.c b/database/crypto/src/main/jni/aes/aes_jni.c
similarity index 100%
rename from crypto/src/main/jni/aes/aes_jni.c
rename to database/crypto/src/main/jni/aes/aes_jni.c
diff --git a/crypto/src/main/jni/aes/sha/Android.mk b/database/crypto/src/main/jni/aes/sha/Android.mk
similarity index 100%
rename from crypto/src/main/jni/aes/sha/Android.mk
rename to database/crypto/src/main/jni/aes/sha/Android.mk
diff --git a/crypto/src/main/jni/aes/sha/brg_endian.h b/database/crypto/src/main/jni/aes/sha/brg_endian.h
similarity index 100%
rename from crypto/src/main/jni/aes/sha/brg_endian.h
rename to database/crypto/src/main/jni/aes/sha/brg_endian.h
diff --git a/crypto/src/main/jni/aes/sha/brg_types.h b/database/crypto/src/main/jni/aes/sha/brg_types.h
similarity index 100%
rename from crypto/src/main/jni/aes/sha/brg_types.h
rename to database/crypto/src/main/jni/aes/sha/brg_types.h
diff --git a/crypto/src/main/jni/aes/sha/hmac.c b/database/crypto/src/main/jni/aes/sha/hmac.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/hmac.c
rename to database/crypto/src/main/jni/aes/sha/hmac.c
diff --git a/crypto/src/main/jni/aes/sha/hmac.h b/database/crypto/src/main/jni/aes/sha/hmac.h
similarity index 100%
rename from crypto/src/main/jni/aes/sha/hmac.h
rename to database/crypto/src/main/jni/aes/sha/hmac.h
diff --git a/crypto/src/main/jni/aes/sha/pwd2key.c b/database/crypto/src/main/jni/aes/sha/pwd2key.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/pwd2key.c
rename to database/crypto/src/main/jni/aes/sha/pwd2key.c
diff --git a/crypto/src/main/jni/aes/sha/pwd2key.h b/database/crypto/src/main/jni/aes/sha/pwd2key.h
similarity index 100%
rename from crypto/src/main/jni/aes/sha/pwd2key.h
rename to database/crypto/src/main/jni/aes/sha/pwd2key.h
diff --git a/crypto/src/main/jni/aes/sha/sha1.c b/database/crypto/src/main/jni/aes/sha/sha1.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/sha1.c
rename to database/crypto/src/main/jni/aes/sha/sha1.c
diff --git a/crypto/src/main/jni/aes/sha/sha1.h b/database/crypto/src/main/jni/aes/sha/sha1.h
similarity index 100%
rename from crypto/src/main/jni/aes/sha/sha1.h
rename to database/crypto/src/main/jni/aes/sha/sha1.h
diff --git a/crypto/src/main/jni/aes/sha/sha1b.c b/database/crypto/src/main/jni/aes/sha/sha1b.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/sha1b.c
rename to database/crypto/src/main/jni/aes/sha/sha1b.c
diff --git a/crypto/src/main/jni/aes/sha/sha2.c b/database/crypto/src/main/jni/aes/sha/sha2.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/sha2.c
rename to database/crypto/src/main/jni/aes/sha/sha2.c
diff --git a/crypto/src/main/jni/aes/sha/sha2.h b/database/crypto/src/main/jni/aes/sha/sha2.h
similarity index 100%
rename from crypto/src/main/jni/aes/sha/sha2.h
rename to database/crypto/src/main/jni/aes/sha/sha2.h
diff --git a/crypto/src/main/jni/aes/sha/sha2b.c b/database/crypto/src/main/jni/aes/sha/sha2b.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/sha2b.c
rename to database/crypto/src/main/jni/aes/sha/sha2b.c
diff --git a/crypto/src/main/jni/aes/sha/shasum.c b/database/crypto/src/main/jni/aes/sha/shasum.c
similarity index 100%
rename from crypto/src/main/jni/aes/sha/shasum.c
rename to database/crypto/src/main/jni/aes/sha/shasum.c
diff --git a/crypto/src/main/jni/argon2/CMakeLists.txt b/database/crypto/src/main/jni/argon2/CMakeLists.txt
similarity index 100%
rename from crypto/src/main/jni/argon2/CMakeLists.txt
rename to database/crypto/src/main/jni/argon2/CMakeLists.txt
diff --git a/crypto/src/main/jni/argon2/argon2_jni.c b/database/crypto/src/main/jni/argon2/argon2_jni.c
similarity index 100%
rename from crypto/src/main/jni/argon2/argon2_jni.c
rename to database/crypto/src/main/jni/argon2/argon2_jni.c
diff --git a/crypto/src/main/jni/argon2/include/argon2.h b/database/crypto/src/main/jni/argon2/include/argon2.h
similarity index 100%
rename from crypto/src/main/jni/argon2/include/argon2.h
rename to database/crypto/src/main/jni/argon2/include/argon2.h
diff --git a/crypto/src/main/jni/argon2/src/CMakeLists.txt b/database/crypto/src/main/jni/argon2/src/CMakeLists.txt
similarity index 100%
rename from crypto/src/main/jni/argon2/src/CMakeLists.txt
rename to database/crypto/src/main/jni/argon2/src/CMakeLists.txt
diff --git a/crypto/src/main/jni/argon2/src/argon2.c b/database/crypto/src/main/jni/argon2/src/argon2.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/argon2.c
rename to database/crypto/src/main/jni/argon2/src/argon2.c
diff --git a/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h b/database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
rename to database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
diff --git a/crypto/src/main/jni/argon2/src/blake2/blake2.h b/database/crypto/src/main/jni/argon2/src/blake2/blake2.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/blake2/blake2.h
rename to database/crypto/src/main/jni/argon2/src/blake2/blake2.h
diff --git a/crypto/src/main/jni/argon2/src/blake2/blake2b.c b/database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/blake2/blake2b.c
rename to database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
diff --git a/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h b/database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
rename to database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
diff --git a/crypto/src/main/jni/argon2/src/core.c b/database/crypto/src/main/jni/argon2/src/core.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/core.c
rename to database/crypto/src/main/jni/argon2/src/core.c
diff --git a/crypto/src/main/jni/argon2/src/core.h b/database/crypto/src/main/jni/argon2/src/core.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/core.h
rename to database/crypto/src/main/jni/argon2/src/core.h
diff --git a/crypto/src/main/jni/argon2/src/encoding.c b/database/crypto/src/main/jni/argon2/src/encoding.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/encoding.c
rename to database/crypto/src/main/jni/argon2/src/encoding.c
diff --git a/crypto/src/main/jni/argon2/src/encoding.h b/database/crypto/src/main/jni/argon2/src/encoding.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/encoding.h
rename to database/crypto/src/main/jni/argon2/src/encoding.h
diff --git a/crypto/src/main/jni/argon2/src/opt.c b/database/crypto/src/main/jni/argon2/src/opt.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/opt.c
rename to database/crypto/src/main/jni/argon2/src/opt.c
diff --git a/crypto/src/main/jni/argon2/src/opt.h b/database/crypto/src/main/jni/argon2/src/opt.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/opt.h
rename to database/crypto/src/main/jni/argon2/src/opt.h
diff --git a/crypto/src/main/jni/argon2/src/ref.c b/database/crypto/src/main/jni/argon2/src/ref.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/ref.c
rename to database/crypto/src/main/jni/argon2/src/ref.c
diff --git a/crypto/src/main/jni/argon2/src/ref.h b/database/crypto/src/main/jni/argon2/src/ref.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/ref.h
rename to database/crypto/src/main/jni/argon2/src/ref.h
diff --git a/crypto/src/main/jni/argon2/src/thread.c b/database/crypto/src/main/jni/argon2/src/thread.c
similarity index 100%
rename from crypto/src/main/jni/argon2/src/thread.c
rename to database/crypto/src/main/jni/argon2/src/thread.c
diff --git a/crypto/src/main/jni/argon2/src/thread.h b/database/crypto/src/main/jni/argon2/src/thread.h
similarity index 100%
rename from crypto/src/main/jni/argon2/src/thread.h
rename to database/crypto/src/main/jni/argon2/src/thread.h
diff --git a/icon-pack-classic/src/main/AndroidManifest.xml b/icon-pack-classic/src/main/AndroidManifest.xml
deleted file mode 100644
index c52107cf4..000000000
--- a/icon-pack-classic/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kunzisoft.keepass.icon.classic" />
diff --git a/icon-pack-material/src/main/AndroidManifest.xml b/icon-pack-material/src/main/AndroidManifest.xml
deleted file mode 100644
index c9c36f0db..000000000
--- a/icon-pack-material/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kunzisoft.keepass.icon.material" />
diff --git a/icon-pack/build.gradle b/icon-pack/build.gradle
new file mode 100644
index 000000000..66c91519a
--- /dev/null
+++ b/icon-pack/build.gradle
@@ -0,0 +1,16 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 32
+    buildToolsVersion '32.0.0'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 32
+    }
+}
+
+dependencies {
+    implementation project(path: ':icon-pack:classic')
+    implementation project(path: ':icon-pack:material')
+}
diff --git a/icon-pack-classic/License.txt b/icon-pack/classic/License.txt
similarity index 100%
rename from icon-pack-classic/License.txt
rename to icon-pack/classic/License.txt
diff --git a/icon-pack-classic/build.gradle b/icon-pack/classic/build.gradle
similarity index 100%
rename from icon-pack-classic/build.gradle
rename to icon-pack/classic/build.gradle
diff --git a/icon-pack/classic/src/main/AndroidManifest.xml b/icon-pack/classic/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..dc27805a5
--- /dev/null
+++ b/icon-pack/classic/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.kunzisoft.keepass.icon.classic" />
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_00_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_00_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_00_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_00_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_01_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_01_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_01_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_01_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_02_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_02_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_02_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_02_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_03_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_03_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_03_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_03_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_04_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_04_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_04_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_04_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_05_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_05_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_05_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_05_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_06_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_06_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_06_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_06_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_07_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_07_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_07_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_07_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_08_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_08_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_08_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_08_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_09_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_09_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_09_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_09_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_10_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_10_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_10_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_10_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_11_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_11_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_11_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_11_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_12_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_12_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_12_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_12_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_13_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_13_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_13_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_13_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_14_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_14_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_14_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_14_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_15_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_15_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_15_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_15_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_16_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_16_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_16_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_16_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_17_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_17_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_17_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_17_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_18_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_18_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_18_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_18_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_19_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_19_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_19_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_19_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_20_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_20_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_20_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_20_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_21_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_21_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_21_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_21_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_22_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_22_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_22_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_22_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_23_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_23_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_23_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_23_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_24_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_24_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_24_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_24_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_25_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_25_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_25_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_25_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_26_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_26_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_26_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_26_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_27_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_27_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_27_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_27_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_28_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_28_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_28_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_28_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_29_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_29_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_29_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_29_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_30_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_30_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_30_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_30_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_31_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_31_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_31_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_31_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_32_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_32_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_32_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_32_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_33_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_33_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_33_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_33_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_34_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_34_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_34_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_34_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_35_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_35_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_35_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_35_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_36_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_36_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_36_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_36_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_37_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_37_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_37_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_37_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_38_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_38_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_38_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_38_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_39_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_39_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_39_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_39_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_40_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_40_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_40_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_40_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_41_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_41_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_41_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_41_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_42_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_42_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_42_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_42_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_43_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_43_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_43_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_43_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_44_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_44_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_44_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_44_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_45_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_45_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_45_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_45_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_46_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_46_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_46_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_46_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_47_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_47_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_47_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_47_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_48_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_48_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_48_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_48_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_49_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_49_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_49_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_49_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_50_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_50_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_50_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_50_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_51_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_51_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_51_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_51_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_52_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_52_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_52_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_52_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_53_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_53_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_53_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_53_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_54_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_54_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_54_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_54_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_55_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_55_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_55_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_55_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_56_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_56_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_56_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_56_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_57_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_57_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_57_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_57_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_58_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_58_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_58_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_58_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_59_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_59_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_59_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_59_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_60_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_60_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_60_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_60_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_61_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_61_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_61_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_61_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_62_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_62_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_62_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_62_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_63_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_63_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_63_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_63_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_64_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_64_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_64_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_64_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_65_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_65_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_65_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_65_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_66_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_66_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_66_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_66_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_67_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_67_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_67_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_67_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-hdpi/classic_68_32dp.png b/icon-pack/classic/src/main/res/drawable-hdpi/classic_68_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-hdpi/classic_68_32dp.png
rename to icon-pack/classic/src/main/res/drawable-hdpi/classic_68_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_00_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_00_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_00_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_00_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_01_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_01_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_01_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_01_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_02_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_02_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_02_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_02_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_03_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_03_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_03_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_03_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_04_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_04_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_04_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_04_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_05_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_05_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_05_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_05_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_06_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_06_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_06_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_06_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_07_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_07_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_07_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_07_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_08_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_08_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_08_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_08_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_09_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_09_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_09_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_09_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_10_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_10_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_10_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_10_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_11_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_11_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_11_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_11_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_12_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_12_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_12_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_12_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_13_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_13_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_13_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_13_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_14_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_14_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_14_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_14_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_15_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_15_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_15_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_15_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_16_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_16_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_16_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_16_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_17_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_17_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_17_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_17_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_18_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_18_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_18_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_18_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_19_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_19_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_19_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_19_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_20_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_20_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_20_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_20_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_21_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_21_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_21_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_21_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_22_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_22_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_22_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_22_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_23_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_23_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_23_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_23_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_24_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_24_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_24_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_24_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_25_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_25_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_25_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_25_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_26_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_26_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_26_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_26_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_27_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_27_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_27_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_27_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_28_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_28_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_28_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_28_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_29_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_29_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_29_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_29_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_30_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_30_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_30_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_30_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_31_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_31_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_31_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_31_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_32_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_32_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_32_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_32_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_33_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_33_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_33_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_33_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_34_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_34_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_34_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_34_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_35_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_35_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_35_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_35_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_36_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_36_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_36_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_36_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_37_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_37_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_37_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_37_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_38_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_38_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_38_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_38_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_39_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_39_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_39_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_39_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_40_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_40_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_40_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_40_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_41_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_41_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_41_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_41_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_42_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_42_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_42_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_42_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_43_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_43_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_43_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_43_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_44_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_44_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_44_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_44_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_45_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_45_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_45_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_45_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_46_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_46_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_46_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_46_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_47_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_47_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_47_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_47_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_48_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_48_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_48_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_48_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_49_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_49_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_49_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_49_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_50_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_50_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_50_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_50_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_51_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_51_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_51_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_51_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_52_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_52_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_52_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_52_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_53_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_53_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_53_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_53_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_54_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_54_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_54_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_54_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_55_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_55_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_55_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_55_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_56_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_56_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_56_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_56_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_57_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_57_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_57_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_57_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_58_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_58_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_58_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_58_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_59_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_59_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_59_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_59_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_60_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_60_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_60_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_60_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_61_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_61_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_61_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_61_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_62_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_62_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_62_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_62_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_63_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_63_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_63_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_63_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_64_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_64_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_64_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_64_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_65_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_65_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_65_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_65_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_66_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_66_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_66_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_66_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_67_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_67_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_67_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_67_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable-ldpi/classic_68_32dp.png b/icon-pack/classic/src/main/res/drawable-ldpi/classic_68_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable-ldpi/classic_68_32dp.png
rename to icon-pack/classic/src/main/res/drawable-ldpi/classic_68_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_00_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_00_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_00_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_00_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_01_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_01_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_01_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_01_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_02_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_02_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_02_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_02_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_03_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_03_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_03_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_03_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_04_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_04_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_04_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_04_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_05_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_05_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_05_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_05_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_06_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_06_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_06_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_06_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_07_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_07_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_07_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_07_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_08_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_08_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_08_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_08_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_09_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_09_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_09_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_09_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_10_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_10_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_10_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_10_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_11_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_11_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_11_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_11_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_12_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_12_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_12_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_12_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_13_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_13_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_13_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_13_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_14_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_14_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_14_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_14_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_15_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_15_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_15_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_15_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_16_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_16_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_16_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_16_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_17_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_17_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_17_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_17_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_18_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_18_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_18_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_18_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_19_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_19_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_19_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_19_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_20_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_20_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_20_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_20_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_21_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_21_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_21_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_21_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_22_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_22_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_22_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_22_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_23_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_23_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_23_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_23_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_24_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_24_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_24_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_24_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_25_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_25_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_25_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_25_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_26_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_26_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_26_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_26_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_27_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_27_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_27_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_27_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_28_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_28_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_28_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_28_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_29_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_29_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_29_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_29_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_30_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_30_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_30_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_30_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_31_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_31_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_31_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_31_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_32_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_32_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_32_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_32_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_33_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_33_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_33_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_33_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_34_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_34_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_34_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_34_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_35_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_35_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_35_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_35_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_36_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_36_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_36_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_36_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_37_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_37_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_37_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_37_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_38_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_38_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_38_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_38_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_39_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_39_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_39_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_39_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_40_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_40_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_40_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_40_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_41_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_41_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_41_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_41_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_42_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_42_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_42_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_42_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_43_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_43_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_43_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_43_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_44_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_44_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_44_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_44_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_45_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_45_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_45_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_45_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_46_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_46_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_46_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_46_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_47_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_47_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_47_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_47_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_48_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_48_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_48_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_48_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_49_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_49_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_49_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_49_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_50_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_50_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_50_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_50_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_51_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_51_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_51_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_51_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_52_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_52_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_52_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_52_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_53_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_53_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_53_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_53_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_54_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_54_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_54_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_54_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_55_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_55_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_55_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_55_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_56_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_56_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_56_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_56_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_57_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_57_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_57_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_57_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_58_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_58_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_58_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_58_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_59_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_59_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_59_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_59_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_60_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_60_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_60_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_60_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_61_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_61_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_61_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_61_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_62_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_62_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_62_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_62_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_63_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_63_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_63_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_63_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_64_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_64_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_64_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_64_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_65_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_65_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_65_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_65_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_66_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_66_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_66_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_66_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_67_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_67_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_67_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_67_32dp.png
diff --git a/icon-pack-classic/src/main/res/drawable/classic_68_32dp.png b/icon-pack/classic/src/main/res/drawable/classic_68_32dp.png
similarity index 100%
rename from icon-pack-classic/src/main/res/drawable/classic_68_32dp.png
rename to icon-pack/classic/src/main/res/drawable/classic_68_32dp.png
diff --git a/icon-pack-classic/src/main/res/values/strings.xml b/icon-pack/classic/src/main/res/values/strings.xml
similarity index 100%
rename from icon-pack-classic/src/main/res/values/strings.xml
rename to icon-pack/classic/src/main/res/values/strings.xml
diff --git a/icon-pack-material/License.txt b/icon-pack/material/License.txt
similarity index 100%
rename from icon-pack-material/License.txt
rename to icon-pack/material/License.txt
diff --git a/icon-pack-material/build.gradle b/icon-pack/material/build.gradle
similarity index 100%
rename from icon-pack-material/build.gradle
rename to icon-pack/material/build.gradle
diff --git a/icon-pack/material/src/main/AndroidManifest.xml b/icon-pack/material/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..4f3bfdbf1
--- /dev/null
+++ b/icon-pack/material/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.kunzisoft.keepass.icon.material" />
diff --git a/icon-pack-material/src/main/res/drawable/material_00_32dp.xml b/icon-pack/material/src/main/res/drawable/material_00_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_00_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_00_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_01_32dp.xml b/icon-pack/material/src/main/res/drawable/material_01_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_01_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_01_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_02_32dp.xml b/icon-pack/material/src/main/res/drawable/material_02_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_02_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_02_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_03_32dp.xml b/icon-pack/material/src/main/res/drawable/material_03_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_03_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_03_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_04_32dp.xml b/icon-pack/material/src/main/res/drawable/material_04_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_04_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_04_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_05_32dp.xml b/icon-pack/material/src/main/res/drawable/material_05_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_05_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_05_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_06_32dp.xml b/icon-pack/material/src/main/res/drawable/material_06_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_06_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_06_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_07_32dp.xml b/icon-pack/material/src/main/res/drawable/material_07_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_07_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_07_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_08_32dp.xml b/icon-pack/material/src/main/res/drawable/material_08_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_08_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_08_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_09_32dp.xml b/icon-pack/material/src/main/res/drawable/material_09_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_09_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_09_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_10_32dp.xml b/icon-pack/material/src/main/res/drawable/material_10_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_10_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_10_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_11_32dp.xml b/icon-pack/material/src/main/res/drawable/material_11_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_11_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_11_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_12_32dp.xml b/icon-pack/material/src/main/res/drawable/material_12_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_12_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_12_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_13_32dp.xml b/icon-pack/material/src/main/res/drawable/material_13_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_13_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_13_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_14_32dp.xml b/icon-pack/material/src/main/res/drawable/material_14_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_14_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_14_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_15_32dp.xml b/icon-pack/material/src/main/res/drawable/material_15_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_15_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_15_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_16_32dp.xml b/icon-pack/material/src/main/res/drawable/material_16_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_16_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_16_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_17_32dp.xml b/icon-pack/material/src/main/res/drawable/material_17_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_17_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_17_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_18_32dp.xml b/icon-pack/material/src/main/res/drawable/material_18_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_18_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_18_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_19_32dp.xml b/icon-pack/material/src/main/res/drawable/material_19_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_19_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_19_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_20_32dp.xml b/icon-pack/material/src/main/res/drawable/material_20_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_20_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_20_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_21_32dp.xml b/icon-pack/material/src/main/res/drawable/material_21_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_21_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_21_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_22_32dp.xml b/icon-pack/material/src/main/res/drawable/material_22_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_22_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_22_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_23_32dp.xml b/icon-pack/material/src/main/res/drawable/material_23_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_23_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_23_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_24_32dp.xml b/icon-pack/material/src/main/res/drawable/material_24_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_24_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_24_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_25_32dp.xml b/icon-pack/material/src/main/res/drawable/material_25_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_25_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_25_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_26_32dp.xml b/icon-pack/material/src/main/res/drawable/material_26_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_26_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_26_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_27_32dp.xml b/icon-pack/material/src/main/res/drawable/material_27_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_27_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_27_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_28_32dp.xml b/icon-pack/material/src/main/res/drawable/material_28_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_28_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_28_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_29_32dp.xml b/icon-pack/material/src/main/res/drawable/material_29_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_29_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_29_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_30_32dp.xml b/icon-pack/material/src/main/res/drawable/material_30_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_30_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_30_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_31_32dp.xml b/icon-pack/material/src/main/res/drawable/material_31_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_31_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_31_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_32_32dp.xml b/icon-pack/material/src/main/res/drawable/material_32_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_32_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_32_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_33_32dp.xml b/icon-pack/material/src/main/res/drawable/material_33_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_33_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_33_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_34_32dp.xml b/icon-pack/material/src/main/res/drawable/material_34_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_34_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_34_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_35_32dp.xml b/icon-pack/material/src/main/res/drawable/material_35_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_35_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_35_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_36_32dp.xml b/icon-pack/material/src/main/res/drawable/material_36_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_36_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_36_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_37_32dp.xml b/icon-pack/material/src/main/res/drawable/material_37_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_37_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_37_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_38_32dp.xml b/icon-pack/material/src/main/res/drawable/material_38_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_38_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_38_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_39_32dp.xml b/icon-pack/material/src/main/res/drawable/material_39_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_39_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_39_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_40_32dp.xml b/icon-pack/material/src/main/res/drawable/material_40_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_40_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_40_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_41_32dp.xml b/icon-pack/material/src/main/res/drawable/material_41_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_41_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_41_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_42_32dp.xml b/icon-pack/material/src/main/res/drawable/material_42_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_42_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_42_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_43_32dp.xml b/icon-pack/material/src/main/res/drawable/material_43_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_43_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_43_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_44_32dp.xml b/icon-pack/material/src/main/res/drawable/material_44_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_44_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_44_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_45_32dp.xml b/icon-pack/material/src/main/res/drawable/material_45_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_45_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_45_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_46_32dp.xml b/icon-pack/material/src/main/res/drawable/material_46_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_46_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_46_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_47_32dp.xml b/icon-pack/material/src/main/res/drawable/material_47_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_47_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_47_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_48_32dp.xml b/icon-pack/material/src/main/res/drawable/material_48_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_48_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_48_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_49_32dp.xml b/icon-pack/material/src/main/res/drawable/material_49_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_49_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_49_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_50_32dp.xml b/icon-pack/material/src/main/res/drawable/material_50_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_50_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_50_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_51_32dp.xml b/icon-pack/material/src/main/res/drawable/material_51_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_51_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_51_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_52_32dp.xml b/icon-pack/material/src/main/res/drawable/material_52_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_52_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_52_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_53_32dp.xml b/icon-pack/material/src/main/res/drawable/material_53_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_53_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_53_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_54_32dp.xml b/icon-pack/material/src/main/res/drawable/material_54_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_54_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_54_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_55_32dp.xml b/icon-pack/material/src/main/res/drawable/material_55_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_55_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_55_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_56_32dp.xml b/icon-pack/material/src/main/res/drawable/material_56_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_56_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_56_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_57_32dp.xml b/icon-pack/material/src/main/res/drawable/material_57_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_57_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_57_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_58_32dp.xml b/icon-pack/material/src/main/res/drawable/material_58_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_58_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_58_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_59_32dp.xml b/icon-pack/material/src/main/res/drawable/material_59_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_59_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_59_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_60_32dp.xml b/icon-pack/material/src/main/res/drawable/material_60_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_60_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_60_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_61_32dp.xml b/icon-pack/material/src/main/res/drawable/material_61_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_61_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_61_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_62_32dp.xml b/icon-pack/material/src/main/res/drawable/material_62_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_62_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_62_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_63_32dp.xml b/icon-pack/material/src/main/res/drawable/material_63_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_63_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_63_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_64_32dp.xml b/icon-pack/material/src/main/res/drawable/material_64_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_64_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_64_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_65_32dp.xml b/icon-pack/material/src/main/res/drawable/material_65_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_65_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_65_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_66_32dp.xml b/icon-pack/material/src/main/res/drawable/material_66_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_66_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_66_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_67_32dp.xml b/icon-pack/material/src/main/res/drawable/material_67_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_67_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_67_32dp.xml
diff --git a/icon-pack-material/src/main/res/drawable/material_68_32dp.xml b/icon-pack/material/src/main/res/drawable/material_68_32dp.xml
similarity index 100%
rename from icon-pack-material/src/main/res/drawable/material_68_32dp.xml
rename to icon-pack/material/src/main/res/drawable/material_68_32dp.xml
diff --git a/icon-pack-material/src/main/res/values/strings.xml b/icon-pack/material/src/main/res/values/strings.xml
similarity index 100%
rename from icon-pack-material/src/main/res/values/strings.xml
rename to icon-pack/material/src/main/res/values/strings.xml
diff --git a/icon-pack/src/main/AndroidManifest.xml b/icon-pack/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..2aa72cc92
--- /dev/null
+++ b/icon-pack/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.kunzisoft.keepass.icon" />
diff --git a/settings.gradle b/settings.gradle
index bd16a5917..14761c683 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
-include ':app', ':icon-pack-classic', ':icon-pack-material', ':crypto'
-include ':database'
+include ':app'
+include ':database', ':database:crypto'
+include ':icon-pack', ':icon-pack:classic', ':icon-pack:material'