diff --git a/web/Gemfile b/web/Gemfile
index 8d6e06166..195f731f8 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -50,6 +50,7 @@ gem 'filepicker-rails', '0.1.0'
 gem 'aws-sdk', '1.29.1'
 gem 'aasm', '3.0.16'
 gem 'carrierwave'
+gem 'carrierwave_direct'
 gem 'fog'
 gem 'haml-rails'
 gem 'unf' #optional fog dependency
diff --git a/web/app/uploaders/image_uploader.rb b/web/app/uploaders/image_uploader.rb
new file mode 100644
index 000000000..f094084d4
--- /dev/null
+++ b/web/app/uploaders/image_uploader.rb
@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+class ImageUploader < CarrierWave::Uploader::Base
+  include CarrierWaveDirect::Uploader
+  include CarrierWave::MimeTypes
+  process :set_content_type
+
+
+  def initialize(*)
+    super
+    JamRuby::UploaderConfiguration.set_aws_public_configuration(self)
+  end
+
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  def extension_white_list
+    %w(jpg jpeg gif png)
+  end
+
+end
diff --git a/web/app/views/users/_buzz_item.html.erb b/web/app/views/users/_buzz_item.html.erb
index 1fccfc34f..78820dea6 100644
--- a/web/app/views/users/_buzz_item.html.erb
+++ b/web/app/views/users/_buzz_item.html.erb
@@ -1,7 +1,7 @@
 
 <!-- buzz item -->
 <%= content_tag(:div, :class => "buzz-item small", :data => { :buzz_item => buzz_item.id}) do %>
-    <%= content_tag(:div, image_tag(buzz_item.image), :class => "avatar_large mr20") %>
+    <%= content_tag(:div, image_tag(buzz_item.image_url, :size => '54x54'), :class => "avatar_large mr20") %>
     <%= content_tag(:div, buzz_item.text_long, :class => "buzz-item-text") %>
     <%= content_tag(:div, "--#{buzz_item.text_short}",  :class => "right", :style => "margin-top:6px;") %>
     <%= content_tag(:div, nil, :class => "clearall") %>
diff --git a/web/config/initializers/jam_ruby/promotional.rb b/web/config/initializers/jam_ruby/promotional.rb
new file mode 100644
index 000000000..7d58bf09d
--- /dev/null
+++ b/web/config/initializers/jam_ruby/promotional.rb
@@ -0,0 +1,3 @@
+class JamRuby::PromoBuzz < JamRuby::Promotional
+  mount_uploader :image, ImageUploader
+end