diff --git a/plugins/oauth_client/lib/oauth_client_plugin/provider.rb b/plugins/oauth_client/lib/oauth_client_plugin/provider.rb
index a62fbfd..fb8c909 100644
--- a/plugins/oauth_client/lib/oauth_client_plugin/provider.rb
+++ b/plugins/oauth_client/lib/oauth_client_plugin/provider.rb
@@ -12,8 +12,10 @@ class OauthClientPlugin::Provider < Noosfero::Plugin::ActiveRecord
   settings_items :client_secret, :type => :string
   settings_items :client_options, :type => Hash
 
-  attr_accessible :identifier, :name, :environment, :strategy, :client_id, :client_secret, :enabled, :client_options
+  attr_accessible :identifier, :name, :environment, :strategy, :client_id, :client_secret, :enabled, :client_options, :image_builder
 
   scope :enabled, :conditions => {:enabled => true}
 
+  acts_as_having_image
+
 end
diff --git a/plugins/oauth_client/public/images/facebook-icon.png b/plugins/oauth_client/public/images/facebook-icon.png
deleted file mode 100644
index 6b48648..0000000
Binary files a/plugins/oauth_client/public/images/facebook-icon.png and /dev/null differ
diff --git a/plugins/oauth_client/public/images/google-icon.png b/plugins/oauth_client/public/images/google-icon.png
deleted file mode 100644
index 3909e9d..0000000
Binary files a/plugins/oauth_client/public/images/google-icon.png and /dev/null differ
diff --git a/plugins/oauth_client/public/style.css b/plugins/oauth_client/public/style.css
index 2f2b17f..a6d3b66 100644
--- a/plugins/oauth_client/public/style.css
+++ b/plugins/oauth_client/public/style.css
@@ -5,18 +5,11 @@
   display: inline-block;
   text-decoration: none;
   background-repeat: no-repeat;
-  padding-left: 22px;
   line-height: 20px;
 }
-
-.oauth-login .provider .facebook {
-  background-image: url(images/facebook-icon.png);
+.oauth-login .provider a img {
+  max-width: 40px;
 }
-
-.oauth-login .provider .google_oauth2 {
-  background-image: url(images/google-icon.png);
-}
-
 .oauth-login .provider .developer {
   display: none;
 }
diff --git a/plugins/oauth_client/views/auth/_oauth_login.html.erb b/plugins/oauth_client/views/auth/_oauth_login.html.erb
index cb523c1..209b21a 100644
--- a/plugins/oauth_client/views/auth/_oauth_login.html.erb
+++ b/plugins/oauth_client/views/auth/_oauth_login.html.erb
@@ -1,13 +1,16 @@
 <div class="oauth-login">
+  <% unless providers.empty? %>
+    <%= _('Login with:') %>
+  <% end %>
   <% providers.each do |provider| %>
     <span class="provider">
-      <%= link_to _('Login with %s' % provider.name), "/plugin/oauth_client/#{provider.strategy}?id=#{provider.id}", :class => provider.strategy %>
+      <%= link_to provider.image ? image_tag(provider.image.public_filename) : provider.name, "/plugin/oauth_client/#{provider.strategy}?id=#{provider.id}", :class => provider.strategy, :title => provider.name %>
     </span>
   <% end %>
 
   <span class="provider">
     <% unless Rails.env.production? %>
-      <%= link_to _('Developer Login'), "/plugin/oauth/developer", :class => 'developer' %>
+      <%= link_to _('Developer Login'), "/plugin/oauth_client/developer", :class => 'developer' %>
     <% end %>
   </span>
 </div>
diff --git a/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb b/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb
index 0e70a18..a0d6932 100644
--- a/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb
+++ b/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb
@@ -35,6 +35,12 @@
     </span>
   </div>
 
+  <div class="image-icon">
+    <%= f.fields_for :image_builder, @provider.image do |i| %>
+      <%= file_field_or_thumbnail(_('Image:'), @provider.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+    <% end %>
+  </div>
+
   <div class="client-id">
     <span class="label">
       <%= _('Client Id') %>
--
libgit2 0.21.2