--- a/application/data/PodcastShowsView.ra	Tue Nov 16 18:02:18 2010 +0000
+++ b/application/data/PodcastShowsView.ra	Fri Nov 19 01:47:31 2010 +0000
@@ -70,13 +70,13 @@
 			},
 		MENU_ITEM
 			{
-			txt = STRING_r_view_download_show_cmd;
+			txt = STRING_r_view_download_show_cmd_short;
 			command = EPodcastDownloadShow;
 			flags = EEikMenuItemSpecific;
 			},
 		MENU_ITEM
 			{
-			txt = STRING_r_view_delete_show_cmd;
+			txt = STRING_r_view_delete_show_cmd_short;
 			command = EPodcastDeleteShow;
 			flags = EEikMenuItemSpecific;
 			}
@@ -145,6 +145,25 @@
                         };
                     };
                 },
+				TBAR_CTRL
+					 {
+					 type = EAknCtButton;
+					 id = EPodcastDownloadAll;
+					 control = AVKON_BUTTON
+						 {
+						 states =
+							 {
+							 AVKON_BUTTON_STATE
+								 {
+								 bmpfile = APPICON;
+								 bmpid = EMbmPodcastDownload_all;
+								 bmpmask = EMbmPodcastDownload_all_mask;
+								 //txt = STRING_r_cancel_update_all_feeds_short_cmd;
+								 helptxt = STRING_r_download_all_shows;
+								}  
+							 };
+						 };
+					 },
                 TBAR_CTRL
                     {
                     type = EAknCtButton;
@@ -164,25 +183,6 @@
                             };
                         };
                     },
-				TBAR_CTRL
-					 {
-					 type = EAknCtButton;
-					 id = EPodcastDownloadAll;
-					 control = AVKON_BUTTON
-						 {
-						 states =
-							 {
-							 AVKON_BUTTON_STATE
-								 {
-								 bmpfile = APPICON;
-								 bmpid = EMbmPodcastDownload_all;
-								 bmpmask = EMbmPodcastDownload_all_mask;
-								 //txt = STRING_r_cancel_update_all_feeds_short_cmd;
-								 helptxt = STRING_r_download_all_shows;
-								}  
-							 };
-						 };
-					 },
 // we keep the download toolbar button in S^3, but always disable it
 // because there are drawing issues with only one item in the toolbar
             TBAR_CTRL