diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,8 +9,8 @@
   'names' => array(
     'conpherence.pkg.css' => '0b64e988',
     'conpherence.pkg.js' => '6249a1cf',
-    'core.pkg.css' => '5b1fcbf1',
-    'core.pkg.js' => '795a0f8b',
+    'core.pkg.css' => '27fd330b',
+    'core.pkg.js' => '14fcb9e4',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => 'a4ba74b5',
     'differential.pkg.js' => '634399e9',
@@ -151,7 +151,7 @@
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
     'rsrc/css/phui/phui-info-view.css' => 'ec92802a',
     'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
-    'rsrc/css/phui/phui-lightbox.css' => '9d65cfb5',
+    'rsrc/css/phui/phui-lightbox.css' => '0a035e40',
     'rsrc/css/phui/phui-list.css' => '9da2aa00',
     'rsrc/css/phui/phui-object-box.css' => '6b487c57',
     'rsrc/css/phui/phui-object-item-list-view.css' => '87278fa0',
@@ -505,7 +505,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => 'c0a04fd9',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => 'e089b29b',
     'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => 'e0ec7f2f',
@@ -651,7 +651,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => 'c0a04fd9',
+    'javelin-behavior-lightbox-attachments' => 'e089b29b',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
@@ -869,7 +869,7 @@
     'phui-info-view-css' => 'ec92802a',
     'phui-inline-comment-view-css' => '5953c28e',
     'phui-invisible-character-view-css' => '6993d9f0',
-    'phui-lightbox-css' => '9d65cfb5',
+    'phui-lightbox-css' => '0a035e40',
     'phui-list-view-css' => '9da2aa00',
     'phui-object-box-css' => '6b487c57',
     'phui-object-item-list-view-css' => '87278fa0',
@@ -1946,15 +1946,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    'c0a04fd9' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     'c40ce0ea' => array(
       'phui-timeline-view-css',
     ),
@@ -2066,6 +2057,15 @@
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
+    'e089b29b' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     'e0ec7f2f' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -278,6 +278,7 @@
           'method' => 'POST',
           'class'  => 'lightbox-download-form',
           'sigil'  => 'download lightbox-download-submit',
+          'id'     => 'lightbox-download-form',
         ),
         phutil_tag(
           'a',
diff --git a/webroot/rsrc/css/phui/phui-lightbox.css b/webroot/rsrc/css/phui/phui-lightbox.css
--- a/webroot/rsrc/css/phui/phui-lightbox.css
+++ b/webroot/rsrc/css/phui/phui-lightbox.css
@@ -55,6 +55,13 @@
   display: block;
   height: 120px;
   width: 320px;
+  color: {$darkbluetext};
+}
+
+.lightbox-attachment .lightbox-icon-frame:hover,
+.lightbox-attachment .lightbox-icon-frame:hover .phui-icon-view {
+  color: {$anchor};
+  text-decoration: none;
 }
 
 .lightbox-attachment.comment-panel-open .lightbox-icon-frame {
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -109,9 +109,11 @@
           target_data.name
         );
       img =
-        JX.$N('div',
+        JX.$N('a',
           {
             className : 'lightbox-icon-frame',
+            sigil : 'lightbox-download-submit',
+            href : '#',
           },
           [ imgIcon, nameElement ]
         );
@@ -362,7 +364,7 @@
 
   var _startDownload = function(e) {
     e.kill();
-    var form = e.getNode('tag:form');
+    var form = JX.$('lightbox-download-form');
     form.submit();
   };