diff --git a/js/component/file-tile.js b/js/component/file-tile.js
index 8690ba5fd..88ce9f55d 100644
--- a/js/component/file-tile.js
+++ b/js/component/file-tile.js
@@ -163,7 +163,7 @@ let FileTile = React.createClass({
             <div>
               {this.props.metadata.content_type.startsWith('video/') ? <WatchLink streamName={this.props.name} button="primary" /> : null}
               {!this.props.isMine
-                ? <DownloadLink streamName={this.props.name} button="text" {... downloadLinkExtraProps}/>
+                ? <DownloadLink streamName={this.props.name} metadata={this.props.metadata} button="text" {... downloadLinkExtraProps}/>
                 : null}
              </div>
             <p className="file-tile__description">
diff --git a/js/component/link.js b/js/component/link.js
index cab18a39b..a667dabdd 100644
--- a/js/component/link.js
+++ b/js/component/link.js
@@ -33,16 +33,27 @@ export let Link = React.createClass({
       (!this.props.className && !this.props.button ? 'button-text' : '') +
       (this.props.disabled ? ' disabled' : '');
 
+    let content;
+    if (this.props.children) { // Custom content
+      content = this.props.children;
+    } else {
+      content = (
+        <span>
+          {'icon' in this.props
+            ? <Icon icon={this.props.icon} fixed={true} />
+            : null}
+           <span className="link-label">{this.props.label}</span>
+          {'badge' in this.props
+            ? <span className="badge">{this.props.badge}</span>
+            : null}
+        </span>
+      );
+    }
+
     return (
       <a className={className} href={this.props.href || 'javascript:;'} title={this.props.title}
          onClick={this.handleClick} {... 'style' in this.props ? {style: this.props.style} : {}}>
-        {'icon' in this.props
-          ? <Icon icon={this.props.icon} fixed={true} />
-          : null}
-        <span className="link-label">{this.props.label}</span>
-        {'badge' in this.props
-          ? <span className="badge">{this.props.badge}</span>
-          : null}
+         {content}
       </a>
     );
   }