diff --git a/include/pinterest.inc.php b/include/pinterest.inc.php
index db5e27e..d0500f6 100644
--- a/include/pinterest.inc.php
+++ b/include/pinterest.inc.php
@@ -13,7 +13,6 @@ function socialbutt_pinterest($basename, $root_url, &$tpl_vars, &$buttons)
   
   // config
   $tpl_vars['PINTEREST'] = $conf['SocialButtons']['pinterest'];
-  $tpl_vars['PINTEREST']['copyright'] = ' (from <a href="'.$root_url.'">'.$conf['gallery_title'].'</a>)';
   $tpl_vars['PINTEREST']['title'] = $picture['current']['TITLE'];
   
   if ($conf['SocialButtons']['pinterest']['img_size'] == 'Original')
diff --git a/include/tumblr.inc.php b/include/tumblr.inc.php
index bd03379..068b1e9 100644
--- a/include/tumblr.inc.php
+++ b/include/tumblr.inc.php
@@ -5,22 +5,8 @@ function socialbutt_tumblr($basename, $root_url, &$tpl_vars, &$buttons)
 {
   global $conf, $template;
   
-  $tumblr_css = array(
-    'share_1' => 'width:81px; height:20px;',
-    'share_2' => 'width:61px; height:20px;',
-    'share_3' => 'width:129px; height:20px;',
-    'share_4' => 'width:20px; height:20px;',
-    'share_1T' => 'width:81px; height:20px;',
-    'share_2T' => 'width:61px; height:20px;',
-    'share_3T' => 'width:129px; height:20px;',
-    'share_4T' => 'width:20px; height:20px;',
-    );
-  
-  
   // config
   $tpl_vars['TUMBLR'] = $conf['SocialButtons']['tumblr'];
-  $tpl_vars['TUMBLR']['css'] = $tumblr_css[ $conf['SocialButtons']['tumblr']['type'] ];
-  $tpl_vars['TUMBLR']['copyright'] = ' (from <a href="'.$root_url.'">'.$conf['gallery_title'].'</a>)';
   
   // button on piture page
   if ($basename == 'picture')
diff --git a/main.inc.php b/main.inc.php
index 6b1eb8f..1aed52f 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -117,6 +117,7 @@ function socialbutt_add_button()
   $tpl_vars = array(
     'share_url' => $share_url,
     'position' => $conf['SocialButtons']['position'],
+    'copyright' => ' (from <a href="'.$root_url.'">'.$conf['gallery_title'].'</a>)',
     );
   $buttons = array();
   
@@ -153,7 +154,10 @@ function socialbutt_add_button()
   }
   
   
-  $template->assign('SOCIALBUTT', $tpl_vars);
+  $template->assign(array(
+    'SOCIALBUTT' => $tpl_vars,
+    'SOCIALBUTT_PATH' => SOCIALBUTT_PATH,
+    ));
   
   // parse buttons
   foreach ($buttons as &$button)
diff --git a/template/facebook.tpl b/template/facebook.tpl
index 299a9de..968c5f9 100644
--- a/template/facebook.tpl
+++ b/template/facebook.tpl
@@ -1,10 +1,10 @@
 {strip}
 {footer_script}jQuery('body').prepend('<div id="fb-root"></div>');{/footer_script}
-{combine_script id='facebook_jssdk' load='async' path='https://connect.facebook.net/'|cat:$SOCIALBUTT.FACEBOOK.lang|cat:'/all.js#xfbml=1'}
+{combine_script id='facebook_jssdk' load='footer' path='https://connect.facebook.net/'|cat:$SOCIALBUTT.FACEBOOK.lang|cat:'/all.js#xfbml=1'}
 
 {if $SOCIALBUTT.FACEBOOK.layout=='none'}
 {html_style}{literal}
-.fb-like span { height: 22px !important; overflow: hidden; margin-right:10px; }
+.fb-like span { height: 22px !important; overflow: hidden !important; margin-right:10px; }
 .fb-like iframe { top: -41px; }
 {/literal}{/html_style}
 {assign var=facebook_layout value='box_count'}
diff --git a/template/google.tpl b/template/google.tpl
index 3d9f3f9..4e5b0af 100644
--- a/template/google.tpl
+++ b/template/google.tpl
@@ -2,5 +2,5 @@
 {combine_script id='google_plusone' load='footer' path='https://apis.google.com/js/plusone.js'}
 
 <script type="text/javascript">window.___gcfg = {ldelim}lang: '{$SOCIALBUTT.GOOGLE.lang}'};</script>
-<div class="g-plusone" data-size="{$SOCIALBUTT.GOOGLE.size}" data-annotation="{$SOCIALBUTT.GOOGLE.annotation}" data-href="{$SOCIALBUTT.share_url}"></div>
+<div style="display:inline-block;" class="g-plusone" data-size="{$SOCIALBUTT.GOOGLE.size}" data-annotation="{$SOCIALBUTT.GOOGLE.annotation}" data-href="{$SOCIALBUTT.share_url}"></div>
 {/strip}
\ No newline at end of file
diff --git a/template/images/twitter_large.png b/template/images/twitter_large.png
index 80ac036..bcb02c9 100644
Binary files a/template/images/twitter_large.png and b/template/images/twitter_large.png differ
diff --git a/template/images/twitter_small.png b/template/images/twitter_small.png
index 4f341df..96df5ff 100644
Binary files a/template/images/twitter_small.png and b/template/images/twitter_small.png differ
diff --git a/template/pinterest.tpl b/template/pinterest.tpl
index 9a77b88..659954c 100644
--- a/template/pinterest.tpl
+++ b/template/pinterest.tpl
@@ -1,6 +1,6 @@
 {strip}
 {combine_script id='pinterest_pinit' path='http://assets.pinterest.com/js/pinit.js'}
 
-<a href="http://pinterest.com/pin/create/button/?url={$SOCIALBUTT.share_url|urlencode}&media={$SOCIALBUTT.PINTEREST.source|urlencode}&description={$SOCIALBUTT.PINTEREST.title|urlencode}{$SOCIALBUTT.PINTEREST.copyright|urlencode}" 
+<a href="http://pinterest.com/pin/create/button/?url={$SOCIALBUTT.share_url|urlencode}&media={$SOCIALBUTT.PINTEREST.source|urlencode}&description={$SOCIALBUTT.PINTEREST.title|cat:$SOCIALBUTT.copyright|urlencode}" 
   class="pin-it-button" count-layout="{$SOCIALBUTT.PINTEREST.layout}"><img border="0" src="http://assets.pinterest.com/images/PinExt.png" title="Pin It"/></a>
 {/strip}
\ No newline at end of file
diff --git a/template/tumblr.tpl b/template/tumblr.tpl
index 998fb70..1d74f0c 100644
--- a/template/tumblr.tpl
+++ b/template/tumblr.tpl
@@ -3,9 +3,9 @@
 
 {if $SOCIALBUTT.TUMBLR.mode=='photo'}
 {capture assign="inline_tags"}{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first},{/if}{$tag.name}{/foreach}{/capture}
-<a href="http://www.tumblr.com/share/photo?source={$SOCIALBUTT.TUMBLR.source|urlencode}&caption={$SOCIALBUTT.TUMBLR.title|urlencode}{$SOCIALBUTT.TUMBLR.copyright|urlencode}&clickthru={$SOCIALBUTT.share_url|urlencode}&tags={$inline_tags|urlencode}"
+<a href="http://www.tumblr.com/share/photo?source={$SOCIALBUTT.TUMBLR.source|urlencode}&caption={$SOCIALBUTT.TUMBLR.title|cat:$SOCIALBUTT.copyright|urlencode}&clickthru={$SOCIALBUTT.share_url|urlencode}&tags={$inline_tags|urlencode}"
 {else}
-<a href="http://www.tumblr.com/share/link?url={$SOCIALBUTT.share_url|urlencode}&name={$SOCIALBUTT.TUMBLR.title|urlencode}&description={$CONTENT_DESCRIPTION|urlencode}{$SOCIALBUTT.TUMBLR.copyright|urlencode}"
+<a href="http://www.tumblr.com/share/link?url={$SOCIALBUTT.share_url|urlencode}&name={$SOCIALBUTT.TUMBLR.title|urlencode}&description={$CONTENT_DESCRIPTION|cat:$SOCIALBUTT.copyright|urlencode}"
 {/if}
-style="display:inline-block;text-indent:-9999px;overflow:hidden;{$SOCIALBUTT.TUMBLR.css}background:url('http://platform.tumblr.com/v1/{$SOCIALBUTT.TUMBLR.type}.png') top left no-repeat transparent;">Tumblr</a>
+><img src="http://platform.tumblr.com/v1/{$SOCIALBUTT.TUMBLR.type}.png" alt="Share on Tumblr"></a>
 {/strip}
\ No newline at end of file
diff --git a/template/twitter.tpl b/template/twitter.tpl
index 438f1f1..1b1f26b 100644
--- a/template/twitter.tpl
+++ b/template/twitter.tpl
@@ -1,7 +1,8 @@
 {strip}
 {combine_script id='twitter_widgets' load='footer' path='http://platform.twitter.com/widgets.js'}
 
-<a href="https://twitter.com/share" class="twitter-share-button" 
+<a href="https://twitter.com/share?url={$SOCIALBUTT.share_url}&text={$PAGE_TITLE|cat:' | '|cat:$GALLERY_TITLE}{if $SOCIALBUTT.TWITTER.via}&via={$SOCIALBUTT.TWITTER.via}{/if}" 
   data-url="{$SOCIALBUTT.share_url}" data-lang="{$SOCIALBUTT.TWITTER.lang}" data-via="{$SOCIALBUTT.TWITTER.via}"
-  data-size="{$SOCIALBUTT.TWITTER.size}" data-count="{$SOCIALBUTT.TWITTER.count}">Tweet</a>
+  data-size="{$SOCIALBUTT.TWITTER.size}" data-count="{$SOCIALBUTT.TWITTER.count}" class="twitter-share-button">
+  <img src="{$ROOT_PATH}{$SOCIALBUTT_PATH}template/images/twitter_{$SOCIALBUTT.TWITTER.size}.png" alt="Share on Twitter"></a>
 {/strip}
\ No newline at end of file