--- a/application/data/PodcastShowsView.ra	Sat Mar 13 16:53:21 2010 +0000
+++ b/application/data/PodcastShowsView.ra	Sat Mar 13 18:48:25 2010 +0000
@@ -98,9 +98,10 @@
                            }  
                         };
                     };
-                }
-#ifdef SYMBIAN1_UI
-            ,TBAR_CTRL
+                },
+// 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
 			{
 			type = EAknCtButton;
 			id = EPodcastDownloadShow;
@@ -117,7 +118,9 @@
 						}  
 					};
 				};
-			},		
+			}
+#ifdef SYMBIAN1_UI                
+        ,		
 		TBAR_CTRL
 			{
 			type = EAknCtButton;

--- a/application/group/Podcast.mmp	Sat Mar 13 16:53:21 2010 +0000
+++ b/application/group/Podcast.mmp	Sat Mar 13 18:48:25 2010 +0000
@@ -16,7 +16,7 @@
  *
  */
 
-MACRO SYMBIAN1_UI
+//MACRO SYMBIAN1_UI
 
 TARGET			Podcast.exe
 TARGETTYPE  	exe

Binary file application/sis/podcatcher_udeb.sis has changed

Binary file application/sis/podcatcher_udeb_signed.sis has changed

Binary file application/sis/podcatcher_urel.sis has changed

Binary file application/sis/podcatcher_urel_signed.sis has changed

--- a/application/src/PodcastShowsView.cpp	Sat Mar 13 16:53:21 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Sat Mar 13 18:48:25 2010 +0000
@@ -652,8 +652,12 @@
 	
 		toolbar->HideItem(EPodcastUpdateFeed, updatingState, ETrue ); 
 		toolbar->HideItem(EPodcastCancelUpdateAllFeeds, !updatingState, ETrue );
-
-#ifdef SYMBIAN1_UI
+#ifndef SYMBIAN1_UI
+		// there seems to be drawing bugs in the toolbar if there is only
+		// one or two buttons defined in the resource, so we have download
+		// there but always hidden
+		toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue );
+#else SYMBIAN1_UI
 		RShowInfoArray &fItems = iPodcastModel.ActiveShowList();
 		TInt itemCnt = fItems.Count();