diff --git a/config/assets.yml b/config/assets.yml
index b5376d182..d8a16bd96 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -19,10 +19,10 @@ javascripts:
     - public/javascripts/vendor/timeago.js
     - public/javascripts/vendor/Mustache.js
     - public/javascripts/vendor/charCount.js
+    - public/javascripts/vendor/facebox.js
     - public/javascripts/jquery.infinitescroll-custom.js
     - public/javascripts/jquery.autocomplete-custom.js
     - public/javascripts/jquery.infieldlabel-custom.js
-    - public/javascripts/facebox-custom.js
     - public/javascripts/keycodes.js
     - public/javascripts/fileuploader-custom.js
     - public/javascripts/diaspora.js
diff --git a/public/javascripts/facebox-custom.js b/public/javascripts/vendor/facebox.js
old mode 100755
new mode 100644
similarity index 89%
rename from public/javascripts/facebox-custom.js
rename to public/javascripts/vendor/facebox.js
index 818f9d628..7d0e39d8f
--- a/public/javascripts/facebox-custom.js
+++ b/public/javascripts/vendor/facebox.js
@@ -1,14 +1,13 @@
 /*
  * Facebox (for jQuery)
- * version: 1.2 (05/05/2008)
+ * version: 1.3
  * @requires jQuery v1.2 or later
- *
- * Examples at http://famspam.com/facebox/
+ * @homepage https://github.com/defunkt/facebox
  *
  * Licensed under the MIT:
  *   http://www.opensource.org/licenses/mit-license.php
  *
- * Copyright 2007, 2008 Chris Wanstrath [ chris@ozmm.org ]
+ * Copyright Forever Chris Wanstrath, Kyle Neath
  *
  * Usage:
  *
@@ -83,17 +82,17 @@
 
   $.extend($.facebox, {
     settings: {
-      opacity      : 0.7,
+      opacity      : 0.2,
       overlay      : true,
-      loadingImage : '/images/facebox/loading.gif',
-      closeImage   : '/images/facebox/closelabel.png',
+      loadingImage : '/facebox/loading.gif',
+      closeImage   : '/facebox/closelabel.png',
       imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
       faceboxHtml  : '\
     <div id="facebox" style="display:none;"> \
       <div class="popup"> \
         <div class="content"> \
         </div> \
-        <a href="#" class="close"><img src="/images/facebox/closelabel.png" title="close" class="close_image" /></a> \
+        <a href="#" class="close"></a> \
       </div> \
     </div>'
     },
@@ -103,14 +102,13 @@
       if ($('#facebox .loading').length == 1) return true
       showOverlay()
 
-      $('#facebox .content').empty()
-      $('#facebox .content').children().hide().end().
+      $('#facebox .content').empty().
         append('<div class="loading"><img src="'+$.facebox.settings.loadingImage+'"/></div>')
 
-      $('#facebox').css({
+      $('#facebox').show().css({
         top:	getPageScroll()[1] + (getPageHeight() / 10),
-        left:	$(window).width() / 2 - 205
-      }).show()
+        left:	$(window).width() / 2 - ($('#facebox .popup').outerWidth() / 2)
+      })
 
       $(document).bind('keydown.facebox', function(e) {
         if (e.keyCode == 27) $.facebox.close()
@@ -122,10 +120,9 @@
     reveal: function(data, klass) {
       $(document).trigger('beforeReveal.facebox')
       if (klass) $('#facebox .content').addClass(klass)
-      $('#facebox .content').append(data)
-      $('#facebox .loading').remove()
-      $('#facebox .body').children().fadeIn('normal')
-      $('#facebox').css('left', $(window).width() / 2 - ($('#facebox .popup').width() / 2))
+      $('#facebox .content').empty().append(data)
+      $('#facebox .popup').children().fadeIn('normal')
+      $('#facebox').css('left', $(window).width() / 2 - ($('#facebox .popup').outerWidth() / 2))
       $(document).trigger('reveal.facebox').trigger('afterReveal.facebox')
     },
 
@@ -172,7 +169,7 @@
     makeCompatible()
 
     var imageTypes = $.facebox.settings.imageTypes.join('|')
-    $.facebox.settings.imageTypesRegexp = new RegExp('\.(' + imageTypes + ')$', 'i')
+    $.facebox.settings.imageTypesRegexp = new RegExp('\\.(' + imageTypes + ')(\\?.*)?$', 'i')
 
     if (settings) $.extend($.facebox.settings, settings)
     $('body').append($.facebox.settings.faceboxHtml)
@@ -186,8 +183,11 @@
       preload.slice(-1).src = $(this).css('background-image').replace(/url\((.+)\)/, '$1')
     })
 
-    $('#facebox .close').click($.facebox.close)
-    $('#facebox .close_image').attr('src', $.facebox.settings.closeImage)
+    $('#facebox .close')
+      .click($.facebox.close)
+      .append('<img src="'
+              + $.facebox.settings.closeImage
+              + '" class="close_image" title="close">')
   }
 
   // getPageScroll() by quirksmode.com
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 95b7cc115..45085b50d 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -80,6 +80,10 @@ var View = {
       .click(this.reshareButton.removeFocus);
 
     /* facebox */
+    $.facebox.settings.closeImage = '/images/facebox/closelabel.png';
+    $.facebox.settings.loadingImage = '/images/facebox/loading.gif';
+    $.facebox.settings.opacity = 0.75;
+
     $('a[rel*=facebox]').facebox();
     $(document).bind('reveal.facebox', function() {
       Diaspora.widgets.directionDetector.updateBinds();
diff --git a/public/javascripts/widgets/alert.js b/public/javascripts/widgets/alert.js
index f05f5e9a1..0ee2a1d9f 100644
--- a/public/javascripts/widgets/alert.js
+++ b/public/javascripts/widgets/alert.js
@@ -16,7 +16,7 @@
 
     this.subscribe("widget/ready", function() {
       $(document).bind("close.facebox", function() {
-				$("#facebox, #diaspora_alert").remove();
+				$("#diaspora_alert").remove();
       });
     });