diff --git a/apks/pivaa.apk b/apks/pivaa.apk
index 0d9ecc47..026eefc3 100644
Binary files a/apks/pivaa.apk and b/apks/pivaa.apk differ
diff --git a/app/src/main/java/com/htbridge/pivaa/EncryptionActivity.java b/app/src/main/java/com/htbridge/pivaa/EncryptionActivity.java
index 1ef8c355..70a8ce95 100644
--- a/app/src/main/java/com/htbridge/pivaa/EncryptionActivity.java
+++ b/app/src/main/java/com/htbridge/pivaa/EncryptionActivity.java
@@ -97,7 +97,7 @@ public void onClick(View view) {
         });
 
 
-        // Decryption AES/CBC/PKCS5Padding
+        // Encryption AES/CBC/PKCS5Padding (Weak IV)
         Button mWeakIVButton = (Button) findViewById(R.id.button_weak_iv);
         mWeakIVButton.setOnClickListener(new View.OnClickListener() {
 
@@ -115,6 +115,27 @@ public void onClick(View view) {
             }
 
         });
+
+
+        // Decryption AES/ECB/PKCS5Padding
+        Button mDecryptionButton = (Button) findViewById(R.id.button_decryption);
+        mDecryptionButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                Log.i("htbridge", "Clicked decrypt button");
+
+                EditText mDecryptionPlaintextView = (EditText) findViewById(R.id.plaintext_decryption);
+                EditText mDecryptionCipherView = (EditText) findViewById(R.id.cipher_decryption);
+
+                String value = mDecryptionCipherView.getText().toString();
+                String decryptionResult = Encryption.decryptAES_ECB_PKCS5Padding(value);
+
+                mDecryptionPlaintextView.setText(decryptionResult, TextView.BufferType.EDITABLE);
+            }
+
+        });
+
     }
 
 }
diff --git a/app/src/main/java/com/htbridge/pivaa/handlers/Encryption.java b/app/src/main/java/com/htbridge/pivaa/handlers/Encryption.java
index 74de342c..65c5c3f9 100644
--- a/app/src/main/java/com/htbridge/pivaa/handlers/Encryption.java
+++ b/app/src/main/java/com/htbridge/pivaa/handlers/Encryption.java
@@ -79,8 +79,6 @@ public static String encryptAES_ECB_PKCS5Padding(String value) {
      */
     public static String decryptAES_ECB_PKCS5Padding(String encryptedBase64) {
         try {
-            byte[] IV = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-            IvParameterSpec iv = new IvParameterSpec(IV);
 
             byte[] key = {
                     1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1