diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs
index 3302fb15..5a39c32a 100644
--- a/src/keepass2android/EntryActivity.cs
+++ b/src/keepass2android/EntryActivity.cs
@@ -665,7 +665,7 @@ namespace keepass2android
 		public override void OnBackPressed()
 		{
 			base.OnBackPressed();
-			OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
+			//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
 		}
 
 		protected void FillData()
@@ -989,7 +989,7 @@ namespace keepass2android
 					//So we can simply Finish. See this page for information on how to do this in more general (future?) cases:
 					//http://developer.android.com/training/implementing-navigation/ancestral.html
 					Finish();
-					OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
+					//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
 
 					return true;
 			}
diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs
index aa7f545a..f55b3bc9 100644
--- a/src/keepass2android/EntryEditActivity.cs
+++ b/src/keepass2android/EntryEditActivity.cs
@@ -672,13 +672,13 @@ namespace keepass2android
 			//somehow after re-creating the activity. Maybe a Mono for Android bug?
 			Intent intent = Intent;
 			intent.PutExtra(IntentContinueWithEditing, true);
-			OverridePendingTransition(0, 0);
+			//OverridePendingTransition(0, 0);
 			intent.AddFlags(ActivityFlags.NoAnimation | ActivityFlags.ForwardResult);
 			_closeForReload = true;
 			SetResult(KeePass.ExitRefreshTitle); //probably the entry will be modified -> let the EditActivity refresh to be safe
 			Finish();
 			
-			OverridePendingTransition(0, 0);
+			//OverridePendingTransition(0, 0);
 			StartActivity(intent);
 		}
 		
diff --git a/src/keepass2android/GroupActivity.cs b/src/keepass2android/GroupActivity.cs
index cc4d2733..13bb38ec 100644
--- a/src/keepass2android/GroupActivity.cs
+++ b/src/keepass2android/GroupActivity.cs
@@ -163,8 +163,8 @@ namespace keepass2android
 		public override void OnBackPressed()
 		{
 			base.OnBackPressed();
-			if ((Group != null) && (Group.ParentGroup != null))
-				OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
+			//if ((Group != null) && (Group.ParentGroup != null))
+				//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
 		}
 		
 		public override bool OnContextItemSelected(IMenuItem item) {
diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs
index 6e606471..d5b6c4b7 100644
--- a/src/keepass2android/GroupBaseActivity.cs
+++ b/src/keepass2android/GroupBaseActivity.cs
@@ -452,7 +452,7 @@ namespace keepass2android
 				//http://developer.android.com/training/implementing-navigation/ancestral.html
 				AppTask.SetActivityResult(this, KeePass.ExitNormal);
 				Finish();
-				OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
+				//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
 
 				return true;
 			}
diff --git a/src/keepass2android/Resources/anim/anim_leave.xml b/src/keepass2android/Resources/anim/anim_leave.xml
index 99f77e5e..7c0fd7c4 100644
--- a/src/keepass2android/Resources/anim/anim_leave.xml
+++ b/src/keepass2android/Resources/anim/anim_leave.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
      android:shareInterpolator="false">
-  <translate android:fromXDelta="0%" android:toXDelta="-100%"
+  <translate android:fromXDelta="0%" android:toXDelta="0%"
              android:fromYDelta="0%" android:toYDelta="0%"
              android:duration="400"/>
 </set>
diff --git a/src/keepass2android/Resources/anim/anim_leave_back.xml b/src/keepass2android/Resources/anim/anim_leave_back.xml
index c78b9d38..de4ea2b6 100644
--- a/src/keepass2android/Resources/anim/anim_leave_back.xml
+++ b/src/keepass2android/Resources/anim/anim_leave_back.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
      android:shareInterpolator="false">
   <translate
-     android:fromXDelta="0%" android:toXDelta="100%"
+     android:fromXDelta="0%" android:toXDelta="0%"
      android:fromYDelta="0%" android:toYDelta="0%"
      android:duration="250" />
 </set>
diff --git a/src/keepass2android/Resources/layout/generate_password.xml b/src/keepass2android/Resources/layout/generate_password.xml
index 7f9d78ad..faa7495b 100644
--- a/src/keepass2android/Resources/layout/generate_password.xml
+++ b/src/keepass2android/Resources/layout/generate_password.xml
@@ -28,26 +28,6 @@
       android:drawableLeft="@drawable/navigation_accept"
       style="@style/BottomBarButton" />
   </RelativeLayout>
-      
-<!--
-      <Button
-        android:id="@+id/accept_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-        
-				android:layout_alignParentRight="true"
-				android:text="@string/accept"
-				style="@style/BottomBarButton" />
-
-      <Button
-        android:id="@+id/cancel_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-        android:drawableLeft="?attr/CancelDrawable"
-				android:layout_alignParentLeft="true"
-				android:text="@android:string/cancel"
-				style="@style/BottomBarButton" />
-        -->
     
     <ScrollView
         android:id="@+id/ScrollView"
diff --git a/src/keepass2android/Resources/layout/plugin_details.xml b/src/keepass2android/Resources/layout/plugin_details.xml
index 8cbcc341..60652f33 100644
--- a/src/keepass2android/Resources/layout/plugin_details.xml
+++ b/src/keepass2android/Resources/layout/plugin_details.xml
@@ -25,7 +25,7 @@
                 android:layout_gravity="center"
                 android:paddingRight="20dp"
                 android:drawablePadding="8dp"
-				android:drawableLeft="?attr/NavigationAcceptDrawable"
+				android:drawableLeft="@drawable/navigation_accept"
                 android:gravity="center_vertical"
                 android:text="@string/accept" />
 		</FrameLayout>
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:paddingRight="20dp"
-                android:drawableLeft="?attr/CancelDrawable"
+                android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:text="@string/deny" />
diff --git a/src/keepass2android/Resources/layout/search.xml b/src/keepass2android/Resources/layout/search.xml
index 32128f28..b7bdde50 100644
--- a/src/keepass2android/Resources/layout/search.xml
+++ b/src/keepass2android/Resources/layout/search.xml
@@ -11,7 +11,7 @@
         android:id="@+id/search_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="?attr/ic_action_search_drawable"
+        android:src="@drawable/ic_action_search"
         android:layout_below="@id/search_label"
         android:layout_alignParentRight="true" />
     <EditText
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 51fb19e3..227427a2 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -447,9 +447,13 @@
     <AndroidResource Include="Resources\layout\entry_extrastring_value.xml" />
     <AndroidResource Include="Resources\values-nb\strings.xml" />
     <AndroidResource Include="Resources\anim\anim_enter.xml" />
-    <AndroidResource Include="Resources\anim\anim_leave.xml" />
+    <AndroidResource Include="Resources\anim\anim_leave.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\anim\anim_enter_back.xml" />
-    <AndroidResource Include="Resources\anim\anim_leave_back.xml" />
+    <AndroidResource Include="Resources\anim\anim_leave_back.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\layout\searchurlresults.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
diff --git a/src/keepass2android/views/PwEntryView.cs b/src/keepass2android/views/PwEntryView.cs
index 552c7538..65323ad4 100644
--- a/src/keepass2android/views/PwEntryView.cs
+++ b/src/keepass2android/views/PwEntryView.cs
@@ -177,7 +177,7 @@ namespace keepass2android.view
 		private void LaunchEntry()
 		{
 			_groupActivity.LaunchActivityForEntry(_entry, _pos);
-			_groupActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
+			//_groupActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
 		}
 		/*
 		public override void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo)
diff --git a/src/keepass2android/views/PwGroupView.cs b/src/keepass2android/views/PwGroupView.cs
index 577ddad7..0fa8da1c 100644
--- a/src/keepass2android/views/PwGroupView.cs
+++ b/src/keepass2android/views/PwGroupView.cs
@@ -115,7 +115,7 @@ namespace keepass2android.view
 		
 		private void LaunchGroup() {
 			GroupActivity.Launch(_groupBaseActivity, _pwGroup, _groupBaseActivity.AppTask);
-			_groupBaseActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
+			//_groupBaseActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
 
 		}
         /*