Case #4081 - Download button improvements