diff --git a/res/layout/cover_fragment.xml b/res/layout/cover_fragment.xml
index 983d14924..3824283da 100644
--- a/res/layout/cover_fragment.xml
+++ b/res/layout/cover_fragment.xml
@@ -35,7 +35,6 @@
         android:layout_alignParentTop="false"
         android:layout_below="@id/txtvFeed"
         android:layout_gravity="center"
-        android:layout_weight="1"
         android:orientation="vertical" >
 
         <ImageView
diff --git a/res/layout/feedinfo.xml b/res/layout/feedinfo.xml
index c2efefa0b..59b4ec9c1 100644
--- a/res/layout/feedinfo.xml
+++ b/res/layout/feedinfo.xml
@@ -60,24 +60,23 @@
 
                 <TextView
                     android:id="@+id/lblAuthor"
-                    android:textStyle="bold"
                     app:layout_row="0"
-                    android:text="@string/author_label" />
+                    android:text="@string/author_label"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/lblLanguage"
-                    android:textStyle="bold"
                     app:layout_column="0"
                     app:layout_row="2"
-                    android:text="@string/language_label" />
+                    android:text="@string/language_label"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/txtvLanguage"
                     android:layout_width="wrap_content"
                     app:layout_column="1"
                     app:layout_gravity="fill_vertical"
-                    app:layout_row="2"
-                    android:text="deutsch" />
+                    app:layout_row="2" />
 
                 <TextView
                     android:id="@+id/txtvAuthor"
@@ -85,13 +84,12 @@
                     app:layout_column="1"
                     app:layout_gravity="fill_vertical"
                     app:layout_row="0"
-                    app:layout_rowSpan="2"
-                    android:text="metaebene personal media - Tim pritlove" />
+                    app:layout_rowSpan="2" />
 
                 <android.support.v7.widget.Space
                     android:id="@+id/space1"
-                    android:layout_height="16dp"
                     android:layout_width="50dp"
+                    android:layout_height="16dp"
                     app:layout_column="0"
                     app:layout_row="1" />
             </android.support.v7.widget.GridLayout>
diff --git a/res/layout/feedlist.xml b/res/layout/feedlist.xml
index 3e7b01bcf..88a2de329 100644
--- a/res/layout/feedlist.xml
+++ b/res/layout/feedlist.xml
@@ -6,10 +6,10 @@
 
 	<ListView android:id="@id/android:list"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="0dp"
 		android:layout_weight="1"/>
 	<TextView android:id="@id/android:empty"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android_text="@string/nofeeds_msg"/>
+		android:text="@string/nofeeds_msg"/>
 </LinearLayout>
diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml
index 5fcaed2c3..b18f65f4b 100644
--- a/res/menu/feeditem.xml
+++ b/res/menu/feeditem.xml
@@ -4,32 +4,33 @@
     <item
         android:id="@+id/download_item"
         android:icon="@drawable/av_download"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/download_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/remove_item"
         android:icon="@drawable/content_discard"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom|collapseActionView"
         android:title="@string/remove_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/play_item"
         android:icon="@drawable/av_play"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/play_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/cancel_download_item"
         android:icon="@drawable/navigation_cancel"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/cancel_download_label"
         android:visible="false">
     </item>
-    <item
+    <item android:id="@+id/stream_item" android:icon="@drawable/action_stream" android:showAsAction="ifRoom" android:title="@string/stream_label" android:visible="false">
+    </item><item
         android:id="@+id/mark_read_item"
         android:showAsAction="collapseActionView"
         android:title="@string/mark_read_label"
@@ -53,13 +54,7 @@
         android:title="@string/remove_from_queue_label"
         android:visible="false">
     </item>
-    <item
-        android:id="@+id/stream_item"
-        android:icon="@drawable/action_stream"
-        android:showAsAction="always"
-        android:title="@string/stream_label"
-        android:visible="false">
-    </item>
+    
     <item
         android:id="@+id/share_link_item"
         android:showAsAction="collapseActionView"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 727686f8b..d75084d84 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,10 +36,9 @@
     <string name="player_paused_msg">Paused</string>
     <string name="player_error_msg">Error!</string>
     <string name="player_stopped_msg">No media playing</string>
-    <string name="player_preparing_msg">Preparing...</string>
+    <string name="player_preparing_msg">Preparing</string>
     <string name="mark_read_label">Mark read</string>
     <string name="mark_unread_label">Mark unread</string>
-    <string name="version_pref">Version</string>
     <string name="other_pref">Other</string>
     <string name="about_pref">About</string>
     <string name="show_download_log">Show Log</string>
@@ -94,10 +93,10 @@
     <string name="download_report_title">All downloads completed</string>
     <string name="refresh_label">Refresh</string>
     <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string>
-    <string name="share_link_label">Share link...</string>
-    <string name="share_source_label">Share source link...</string>
+    <string name="share_link_label">Share link</string>
+    <string name="share_source_label">Share source link</string>
     <string name="clear_queue_label">Clear queue</string>
-    <string name="refreshing_label">Refreshing...</string>
+    <string name="refreshing_label">Refreshing</string>
     <string name="download_log_label">Download log</string>
     <string name="flattr_auth_label">Flattr sign-in</string>
     <string name="flattr_auth_explanation">Press the button below to start the authentication process. You will be forwarded to the flattr login screen in your browser and be asked to give Antennapod the permission to flattr things. After you have given permission, you will return to this screen automatically.</string>
diff --git a/src/de/danoeh/antennapod/service/DownloadService.java b/src/de/danoeh/antennapod/service/DownloadService.java
index 99e868bff..9da3b0d4a 100644
--- a/src/de/danoeh/antennapod/service/DownloadService.java
+++ b/src/de/danoeh/antennapod/service/DownloadService.java
@@ -27,7 +27,6 @@ import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.syndication.handler.FeedHandler;
 import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
 import de.danoeh.antennapod.util.DownloadError;
-import android.R;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -164,13 +163,13 @@ public class DownloadService extends Service {
 				PendingIntent.FLAG_UPDATE_CURRENT);
 
 		Bitmap icon = BitmapFactory.decodeResource(null,
-				R.drawable.stat_notify_sync_noanim);
+				android.R.drawable.stat_notify_sync_noanim);
 		notificationBuilder = new NotificationCompat.Builder(this)
 				.setContentTitle("Downloading Podcast data")
 				.setContentText(
 						requester.getNumberOfDownloads() + " Downloads left")
 				.setOngoing(true).setContentIntent(pIntent).setLargeIcon(icon)
-				.setSmallIcon(R.drawable.stat_notify_sync_noanim);
+				.setSmallIcon(android.R.drawable.stat_notify_sync_noanim);
 
 		startForeground(NOTIFICATION_ID, notificationBuilder.getNotification());
 		Log.d(TAG, "Notification set up");
@@ -295,10 +294,10 @@ public class DownloadService extends Service {
 					.setContentText(
 							successfulDownloads + " Downloads succeeded, "
 									+ failedDownloads + " failed")
-					.setSmallIcon(R.drawable.stat_notify_sync)
+					.setSmallIcon(android.R.drawable.stat_notify_sync)
 					.setLargeIcon(
 							BitmapFactory.decodeResource(null,
-									R.drawable.stat_notify_sync))
+									android.R.drawable.stat_notify_sync))
 					.setContentIntent(
 							PendingIntent.getActivity(this, 0, new Intent(this,
 									MainActivity.class), 0))
diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index 85118419b..355706bc9 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.service;
 
 import java.io.IOException;
 
-import android.R;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ -514,12 +513,12 @@ public class PlaybackService extends Service {
 				PendingIntent.FLAG_UPDATE_CURRENT);
 
 		Bitmap icon = BitmapFactory.decodeResource(null,
-				R.drawable.stat_notify_sdcard);
+				android.R.drawable.stat_notify_sdcard);
 		notificationBuilder = new NotificationCompat.Builder(this)
 				.setContentTitle("Mediaplayer Service")
 				.setContentText("Click here for more info").setOngoing(true)
 				.setContentIntent(pIntent).setLargeIcon(icon)
-				.setSmallIcon(R.drawable.stat_notify_sdcard);
+				.setSmallIcon(android.R.drawable.stat_notify_sdcard);
 
 		startForeground(NOTIFICATION_ID, notificationBuilder.getNotification());
 		Log.d(TAG, "Notification set up");