HUE-922 [fb] Rename a directory to one that already exists moves the directory under the one that exists

Fixed behavior
Changed file download icon