diff --git a/client/src/components/molecules/Dropzone.module.scss b/client/src/components/molecules/Dropzone.module.scss
index 8f9b051..a6518ab 100644
--- a/client/src/components/molecules/Dropzone.module.scss
+++ b/client/src/components/molecules/Dropzone.module.scss
@@ -4,7 +4,7 @@
     margin-top: $spacer;
     margin-bottom: $spacer;
     border: .2rem dashed $brand-grey-lighter;
-    border-radius: 1rem;
+    border-radius: $border-radius * 2;
     padding: $spacer;
     background: $brand-white;
     transition: .2s ease-out;
@@ -17,6 +17,7 @@
         color: $brand-grey-light;
     }
 
+    &:hover,
     &:focus,
     &:active {
         border-color: $brand-grey-light;
diff --git a/client/src/components/molecules/Dropzone.tsx b/client/src/components/molecules/Dropzone.tsx
index 08974b6..d8ed890 100644
--- a/client/src/components/molecules/Dropzone.tsx
+++ b/client/src/components/molecules/Dropzone.tsx
@@ -6,7 +6,7 @@ export default function Dropzone({
     handleOnDrop,
     disabled
 }: {
-    handleOnDrop(files: FileList): void
+    handleOnDrop(files: File[]): void
     disabled?: boolean
 }) {
     const onDrop = useCallback(acceptedFiles => handleOnDrop(acceptedFiles), [
diff --git a/client/src/routes/Publish/Files/Ipfs/index.tsx b/client/src/routes/Publish/Files/Ipfs/index.tsx
index ab3cd01..161d031 100644
--- a/client/src/routes/Publish/Files/Ipfs/index.tsx
+++ b/client/src/routes/Publish/Files/Ipfs/index.tsx
@@ -8,13 +8,13 @@ import Dropzone from '../../../../components/molecules/Dropzone'
 import { formatBytes, pingUrl } from './utils'
 import styles from './index.module.scss'
 
-export default function Ipfs({ addFile }: { addFile(url: string): void }) {
-    const config = {
-        host: 'ipfs.infura.io',
-        port: '5001',
-        protocol: 'https'
-    }
+const config = {
+    host: 'ipfs.infura.io',
+    port: '5001',
+    protocol: 'https'
+}
 
+export default function Ipfs({ addFile }: { addFile(url: string): void }) {
     const {
         ipfs,
         ipfsVersion,
@@ -26,16 +26,24 @@ export default function Ipfs({ addFile }: { addFile(url: string): void }) {
     const [loading, setLoading] = useState(false)
     const [message, setMessage] = useState('')
 
-    async function saveToIpfs(buffer: Buffer) {
+    async function saveToIpfs(
+        data: File | Buffer | ReadableStream,
+        size: number
+    ) {
+        const totalSize = formatBytes(size, 0)
+
         setLoading(true)
-        setMessage('Adding to remote IPFS node<br />')
+        setMessage(`Adding to IPFS<br /><small>0/${totalSize}</small><br />`)
 
         try {
-            const response = await ipfs.add(buffer, {
+            const response = await ipfs.add(data, {
                 progress: (length: number) =>
                     setMessage(
-                        `Adding to remote IPFS node<br />
-                        ${formatBytes(length, 0)}`
+                        `Adding to IPFS<br />
+                        <small>${formatBytes(
+                            length,
+                            0
+                        )}/${totalSize}</small><br />`
                     )
             })
 
@@ -43,9 +51,9 @@ export default function Ipfs({ addFile }: { addFile(url: string): void }) {
             console.log(`File added: ${cid}`)
 
             // Ping gateway url to make it globally available,
-            // but store ipfs.io url in DDO.
+            // but store native url in DDO.
             // https://ipfs.github.io/public-gateway-checker/
-            const url = `https://ipfs.io/ipfs/${cid}`
+            const url = `ipfs://${cid}`
             const urlGateway = `https://ipfs.infura.io/ipfs/${cid}`
 
             setMessage('Checking IPFS gateway URL')
@@ -54,22 +62,13 @@ export default function Ipfs({ addFile }: { addFile(url: string): void }) {
             // add IPFS url to file.url
             addFile(url)
         } catch (error) {
-            console.error(error.message)
+            console.error(`Adding to IPFS failed: ${error.message}`)
             setLoading(false)
         }
     }
 
-    function handleOnDrop(files: any) {
-        const reader: any = new FileReader()
-
-        files &&
-            files.forEach((file: File) => {
-                reader.readAsArrayBuffer(file)
-                reader.onloadend = () => {
-                    const buffer: any = Buffer.from(reader.result)
-                    saveToIpfs(buffer)
-                }
-            })
+    function handleOnDrop(files: File[]) {
+        files.forEach((file: File) => saveToIpfs(file, file.size))
     }
 
     return (