diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3933bce40..49e53fbda 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:windowSoftInputMode="adjustPan"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
index d30f90dee..17a696b3d 100644
--- a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
@@ -17,6 +17,7 @@ import org.fossasia.openevent.general.utils.AppLinkUtils
 import org.fossasia.openevent.general.utils.Utils.navAnimGone
 import org.fossasia.openevent.general.utils.Utils.navAnimVisible
 import org.jetbrains.anko.design.snackbar
+import org.koin.androidx.scope.BuildConfig
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 const val PLAY_STORE_BUILD_FLAVOR = "playStore"
diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt
index 18c9dfb8a..9dc1e85e0 100644
--- a/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt
@@ -208,7 +208,7 @@ class EditProfileFragment : Fragment(), ComplexBackPressFragment {
         userTwitter = user.twitterUrl.nullToEmpty()
         userInstagram = user.instagramUrl.nullToEmpty()
 
-        if (safeArgs.croppedImage.isEmpty()) {
+        if (safeArgs.croppedImage.equals("''")) {
             if (!editProfileViewModel.userAvatar.isNullOrEmpty() && !editProfileViewModel.avatarUpdated) {
                 val drawable = requireDrawable(requireContext(), R.drawable.ic_account_circle_grey)
                 Picasso.get()
diff --git a/app/src/main/java/org/fossasia/openevent/general/utils/ImageUtils.kt b/app/src/main/java/org/fossasia/openevent/general/utils/ImageUtils.kt
index 6aa4a9a74..4edc2ed91 100644
--- a/app/src/main/java/org/fossasia/openevent/general/utils/ImageUtils.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/utils/ImageUtils.kt
@@ -15,7 +15,7 @@ object ImageUtils {
     }
 
     fun decodeBitmap(encodedBitmap: String): Bitmap {
-        val decodedString = Base64.decode(encodedBitmap, Base64.DEFAULT)
+        val decodedString = Base64.decode(encodedBitmap, Base64.DEFAULT or Base64.NO_WRAP)
         return BitmapFactory.decodeByteArray(decodedString, 0, decodedString.size)
     }
 }