diff --git a/app/build.gradle b/app/build.gradle
index d5188376..f31d092f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.danielkim.soundrecorder"
         minSdkVersion 16
         targetSdkVersion 21
-        versionCode 3
-        versionName "1.2.0"
+        versionCode 4
+        versionName "1.2.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java b/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java
index 0f24fa6d..5d987630 100644
--- a/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java
+++ b/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java
@@ -25,6 +25,7 @@
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by Daniel on 12/29/2014.
@@ -37,7 +38,6 @@ public class FileViewerAdapter extends RecyclerView.Adapter<FileViewerAdapter.Re
     private DBHelper mDatabase;
     private static final SimpleDateFormat mDateAddedFormatter =
             new SimpleDateFormat("MMM dd, yyyy - hh:mm a", Locale.getDefault());
-    private static final SimpleDateFormat mLengthFormatter = new SimpleDateFormat("mm:ss", Locale.getDefault());
 
     RecordingItem item;
     Context mContext;
@@ -55,9 +55,14 @@ public FileViewerAdapter(Context context, LinearLayoutManager linearLayoutManage
     public void onBindViewHolder(final RecordingsViewHolder holder, int position) {
 
         item = getItem(position);
+        long itemDuration = item.getLength();
+
+        long minutes = TimeUnit.MILLISECONDS.toMinutes(itemDuration);
+        long seconds = TimeUnit.MILLISECONDS.toSeconds(itemDuration)
+                - TimeUnit.MINUTES.toSeconds(minutes);
 
         holder.vName.setText(item.getName());
-        holder.vLength.setText(mLengthFormatter.format(item.getLength()));
+        holder.vLength.setText(String.format("%02d:%02d", minutes,seconds));
         holder.vDateAdded.setText(mDateAddedFormatter.format(item.getTime()));
 
         // define an on click listener to open PlaybackFragment
@@ -67,6 +72,7 @@ public void onClick(View view) {
                 try {
                     PlaybackFragment playbackFragment =
                             new PlaybackFragment().newInstance(getItem(holder.getPosition()));
+
                     FragmentTransaction transaction = ((FragmentActivity) mContext)
                             .getSupportFragmentManager()
                             .beginTransaction();
diff --git a/app/src/main/java/com/danielkim/soundrecorder/fragments/PlaybackFragment.java b/app/src/main/java/com/danielkim/soundrecorder/fragments/PlaybackFragment.java
index bbcae815..162ab2e2 100644
--- a/app/src/main/java/com/danielkim/soundrecorder/fragments/PlaybackFragment.java
+++ b/app/src/main/java/com/danielkim/soundrecorder/fragments/PlaybackFragment.java
@@ -21,8 +21,7 @@
 import com.melnykov.fab.FloatingActionButton;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by Daniel on 1/1/2015.
@@ -36,7 +35,6 @@ public class PlaybackFragment extends DialogFragment{
 
     private Handler mHandler = new Handler();
 
-    private static final SimpleDateFormat mLengthFormatter = new SimpleDateFormat("mm:ss", Locale.getDefault());
     private MediaPlayer mMediaPlayer = null;
 
     private SeekBar mSeekBar = null;
@@ -48,6 +46,10 @@ public class PlaybackFragment extends DialogFragment{
     //stores whether or not the mediaplayer is currently playing audio
     private boolean isPlaying = false;
 
+    //stores minutes and seconds of the length of the file.
+    long minutes = 0;
+    long seconds = 0;
+
     public PlaybackFragment newInstance(RecordingItem item) {
         PlaybackFragment f = new PlaybackFragment();
         Bundle b = new Bundle();
@@ -61,6 +63,16 @@ public PlaybackFragment newInstance(RecordingItem item) {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         item = getArguments().getParcelable(ARG_ITEM);
+
+        long itemDuration = item.getLength();
+        minutes = TimeUnit.MILLISECONDS.toMinutes(itemDuration);
+        seconds = TimeUnit.MILLISECONDS.toSeconds(itemDuration)
+                - TimeUnit.MINUTES.toSeconds(minutes);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
     }
 
     @NonNull
@@ -88,7 +100,12 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 if(mMediaPlayer != null && fromUser) {
                     mMediaPlayer.seekTo(progress);
                     mHandler.removeCallbacks(mRunnable);
-                    mCurrentProgressTextView.setText(mLengthFormatter.format(mMediaPlayer.getCurrentPosition()));
+
+                    long minutes = TimeUnit.MILLISECONDS.toMinutes(mMediaPlayer.getCurrentPosition());
+                    long seconds = TimeUnit.MILLISECONDS.toSeconds(mMediaPlayer.getCurrentPosition())
+                            - TimeUnit.MINUTES.toSeconds(minutes);
+                    mCurrentProgressTextView.setText(String.format("%02d:%02d", minutes,seconds));
+
                     updateSeekBar();
 
                 } else if (mMediaPlayer == null && fromUser) {
@@ -110,7 +127,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
                 if (mMediaPlayer != null) {
                     mHandler.removeCallbacks(mRunnable);
                     mMediaPlayer.seekTo(seekBar.getProgress());
-                    mCurrentProgressTextView.setText(mLengthFormatter.format(mMediaPlayer.getCurrentPosition()));
+
+                    long minutes = TimeUnit.MILLISECONDS.toMinutes(mMediaPlayer.getCurrentPosition());
+                    long seconds = TimeUnit.MILLISECONDS.toSeconds(mMediaPlayer.getCurrentPosition())
+                            - TimeUnit.MINUTES.toSeconds(minutes);
+                    mCurrentProgressTextView.setText(String.format("%02d:%02d", minutes,seconds));
                     updateSeekBar();
                 }
             }
@@ -126,7 +147,7 @@ public void onClick(View v) {
         });
 
         mFileNameTextView.setText(item.getName());
-        mFileLengthTextView.setText(mLengthFormatter.format(item.getLength()));
+        mFileLengthTextView.setText(String.format("%02d:%02d", minutes,seconds));
 
         builder.setView(view);
 
@@ -267,7 +288,7 @@ private void stopPlaying() {
         mSeekBar.setProgress(mSeekBar.getMax());
         isPlaying = !isPlaying;
 
-        mCurrentProgressTextView.setText(mLengthFormatter.format(item.getLength()));
+        mCurrentProgressTextView.setText(mFileLengthTextView.getText());
         mSeekBar.setProgress(mSeekBar.getMax());
 
         //allow the screen to turn off again once audio is finished playing
@@ -282,7 +303,12 @@ public void run() {
 
                 int mCurrentPosition = mMediaPlayer.getCurrentPosition();
                 mSeekBar.setProgress(mCurrentPosition);
-                mCurrentProgressTextView.setText(mLengthFormatter.format(mCurrentPosition));
+
+                long minutes = TimeUnit.MILLISECONDS.toMinutes(mCurrentPosition);
+                long seconds = TimeUnit.MILLISECONDS.toSeconds(mCurrentPosition)
+                        - TimeUnit.MINUTES.toSeconds(minutes);
+                mCurrentProgressTextView.setText(String.format("%02d:%02d", minutes,seconds));
+
                 updateSeekBar();
             }
         }
diff --git a/app/src/main/res/drawable-hdpi/ic_media_pause.png b/app/src/main/res/drawable-hdpi/ic_media_pause.png
index 1d465a41..66c122f5 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_media_pause.png and b/app/src/main/res/drawable-hdpi/ic_media_pause.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_media_play.png b/app/src/main/res/drawable-hdpi/ic_media_play.png
index 2746d17f..ec3c760b 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_media_play.png and b/app/src/main/res/drawable-hdpi/ic_media_play.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_media_stop.png b/app/src/main/res/drawable-hdpi/ic_media_stop.png
index a0ff1369..28181a18 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_media_stop.png and b/app/src/main/res/drawable-hdpi/ic_media_stop.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_media_pause.png b/app/src/main/res/drawable-mdpi/ic_media_pause.png
index 3e6b2a17..eb88fca7 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_media_pause.png and b/app/src/main/res/drawable-mdpi/ic_media_pause.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_media_play.png b/app/src/main/res/drawable-mdpi/ic_media_play.png
index 7966bbc5..cca64c62 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_media_play.png and b/app/src/main/res/drawable-mdpi/ic_media_play.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_media_stop.png b/app/src/main/res/drawable-mdpi/ic_media_stop.png
index 8ea7efee..9a015789 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_media_stop.png and b/app/src/main/res/drawable-mdpi/ic_media_stop.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_media_pause.png b/app/src/main/res/drawable-xhdpi/ic_media_pause.png
index 6bd3d482..e891e5b2 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_media_pause.png and b/app/src/main/res/drawable-xhdpi/ic_media_pause.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_media_play.png b/app/src/main/res/drawable-xhdpi/ic_media_play.png
index ccfef180..82035963 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_media_play.png and b/app/src/main/res/drawable-xhdpi/ic_media_play.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_media_stop.png b/app/src/main/res/drawable-xhdpi/ic_media_stop.png
index 89f36950..52de442b 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_media_stop.png and b/app/src/main/res/drawable-xhdpi/ic_media_stop.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_media_pause.png b/app/src/main/res/drawable-xxhdpi/ic_media_pause.png
index 9a36b17c..d9963346 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_media_pause.png and b/app/src/main/res/drawable-xxhdpi/ic_media_pause.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_media_play.png b/app/src/main/res/drawable-xxhdpi/ic_media_play.png
index 41f76bbf..f7a58720 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_media_play.png and b/app/src/main/res/drawable-xxhdpi/ic_media_play.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_media_stop.png b/app/src/main/res/drawable-xxhdpi/ic_media_stop.png
index c09989ac..a15a681d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_media_stop.png and b/app/src/main/res/drawable-xxhdpi/ic_media_stop.png differ
diff --git a/app/src/main/res/layout/card_view.xml b/app/src/main/res/layout/card_view.xml
index a5001ef7..0ec48c46 100644
--- a/app/src/main/res/layout/card_view.xml
+++ b/app/src/main/res/layout/card_view.xml
@@ -19,14 +19,14 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_launcher"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="7dp"
-            android:layout_marginRight="7dp"/>
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_fileviewer"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="7dp"
+                android:layout_marginRight="7dp"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 5f9775f7..07b371ca 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -18,6 +18,22 @@
         <!-- specify shared element enter and exit transitions -->
         <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
         <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+
+        <!-- specify enter and exit transitions -->
+        <item name="android:windowEnterTransition">@android:transition/explode</item>
+        <item name="android:windowExitTransition">@android:transition/explode</item>
+    </style>
+
+    <!-- Theme for Playback DialogFragment -->
+    <style name="PlaybackFragmentAnimation" parent="@android:style/Theme.Panel">
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+
+        <!-- specify shared element enter and exit transitions -->
+        <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
+        <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+
         <!-- specify enter and exit transitions -->
         <item name="android:windowEnterTransition">@android:transition/explode</item>
         <item name="android:windowExitTransition">@android:transition/explode</item>