Fix to destination path and download icon behaviour