diff --git a/res/anim/slide_from_left.xml b/res/anim/slide_from_left.xml
deleted file mode 100644
index 7e00a0272f..0000000000
--- a/res/anim/slide_from_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
-    <translate
-        android:duration="250"
-        android:fromXDelta="-100%"
-        android:toXDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/res/anim/slide_from_right.xml b/res/anim/slide_from_right.xml
deleted file mode 100644
index feeaaf7513..0000000000
--- a/res/anim/slide_from_right.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
-    <translate
-        android:duration="250"
-        android:fromXDelta="100%"
-        android:toXDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/res/anim/slide_to_left.xml b/res/anim/slide_to_left.xml
deleted file mode 100644
index 8fd13ee473..0000000000
--- a/res/anim/slide_to_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
-    <translate
-        android:duration="250"
-        android:fromXDelta="0%"
-        android:toXDelta="-100%" />
-</set>
\ No newline at end of file
diff --git a/res/anim/slide_to_right.xml b/res/anim/slide_to_right.xml
deleted file mode 100644
index 0a33f3dd3f..0000000000
--- a/res/anim/slide_to_right.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
-    <translate
-        android:duration="250"
-        android:fromXDelta="0%"
-        android:toXDelta="100%" />
-</set>
\ No newline at end of file
diff --git a/res/layout/profile_preference_view.xml b/res/layout/profile_preference_view.xml
index 2b3868839b..71da055387 100644
--- a/res/layout/profile_preference_view.xml
+++ b/res/layout/profile_preference_view.xml
@@ -23,6 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:textSize="20sp"
+                android:textAlignment="viewStart"
                 tools:text="Voltarine DeClyre"/>
 
         <TextView android:id="@+id/number"
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 0efe2a6c3a..c4ed92b3e9 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -233,7 +233,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, startingPosition);
 
     startActivity(intent);
-    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
+    overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
index 0e648fed3f..7f5ca12c7d 100644
--- a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
@@ -61,7 +61,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
     intent.putExtra(ConversationActivity.LAST_SEEN_EXTRA, lastSeenTime);
 
     startActivity(intent);
-    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
+    overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index a088e737f2..e701c59ebc 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -442,7 +442,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected void onPause() {
     super.onPause();
     MessageNotifier.setVisibleThread(-1L);
-    if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
+    if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_end);
     inputPanel.onPause();
 
     fragment.setLastSeen(System.currentTimeMillis());
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
index 2101069a9b..9673f000e4 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
@@ -87,12 +87,7 @@ public class ConversationPopupActivity extends ConversationActivity {
             intent.putExtra(ConversationActivity.ADDRESS_EXTRA, getRecipient().getAddress());
             intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, result);
 
-            if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
-              startActivity(intent, transition.toBundle());
-            } else {
-              startActivity(intent);
-              overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
-            }
+            startActivity(intent, transition.toBundle());
 
             finish();
           }
diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
index 0e3bc5fe99..1af86fe588 100644
--- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
@@ -48,7 +48,7 @@ public class WelcomeActivity extends BaseActionBarActivity {
           }
 
           startActivity(nextIntent);
-          overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
+          overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
           finish();
         })
         .execute();