diff --git a/jOOQ-website/css/jooq.css b/jOOQ-website/css/jooq.css
index d1185efb5f..3731d4f0a1 100644
--- a/jOOQ-website/css/jooq.css
+++ b/jOOQ-website/css/jooq.css
@@ -220,7 +220,6 @@ h2 a:hover {
 }
 
 #tweets {
-    padding-top: 4px;
     height: 25px;
     float: left;
 }
@@ -231,9 +230,12 @@ h2 a:hover {
 
 div.tweet-item {
     float: left;
-    width: 100px;
-    white-space: nowrap;
-    overflow: hidden;
+    padding-right: 20px;
+}
+
+div.tweet-item img {
+    box-shadow: 0 0 5px #000;
+    border: 0;
 }
 
 #navigation a,
diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php
index 8d773ef437..2c85677125 100644
--- a/jOOQ-website/frame.php
+++ b/jOOQ-website/frame.php
@@ -69,39 +69,20 @@ function manualHeader($isSingle, $forVersion) {
 	    <div class="wrapper">
 		<div id="tweets">
 			<div class="tweet-item">
-				<a href="http://twitter.com/share"
-					class="twitter-share-button"
-					data-url="http://www.jooq.org"
-					data-text="#jOOQ - A nice database abstraction library for Java"
-					data-count="horizontal" data-via="JavaOOQ">Tweet</a>
-				<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-				&nbsp;
+				<a href="http://twitter.com/share?text=%23jOOQ,+a+fun+way+to+write+%23SQL+in+%23Java:+http://www.jooq.org" target="_blank">
+					<img src="<?=$root?>/img/social-tw.png" width="37" height="27" alt="Share jOOQ on Twitter" title="Share jOOQ on Twitter"/></a>
 			</div>
 			<div class="tweet-item">
-				<g:plusone size="medium" href="http://www.jooq.org"></g:plusone>
-				&nbsp;
+				<a href="https://plus.google.com/share?url=http://www.jooq.org" target="_blank">
+	    			<img src="<?=$root?>/img/social-g+.png" alt="Share jOOQ on Google+" title="Share jOOQ on Google+"/></a>
 			</div>
 			<div class="tweet-item">
-				<div id="fb-root"></div>
-				<script>(function(d, s, id) {
-				  var js, fjs = d.getElementsByTagName(s)[0];
-				  if (d.getElementById(id)) {return;}
-				  js = d.createElement(s); js.id = id;
-				  js.src = "//connect.facebook.net/en_US/all.js#appId=232666253447462&xfbml=1";
-				  fjs.parentNode.insertBefore(js, fjs);
-				}(document, 'script', 'facebook-jssdk'));</script>
-				<div class="fb-like"
-					data-send="false"
-					data-href="http://www.jooq.org"
-					data-layout="button_count"
-					data-width="450"
-					data-show-faces="true"
-					data-font="verdana"></div>
-					&nbsp;
+				<a href="http://www.facebook.com/sharer.php?u=http://www.jooq.org" target="_blank">
+	    			<img src="<?=$root?>/img/social-fb.png" alt="Share jOOQ on Facebook" title="Share jOOQ on Facebook"/></a>
 			</div>
 			<div class="tweet-item">
-				<script src="//platform.linkedin.com/in.js" type="text/javascript"></script>
-				<script type="IN/Share" data-url="http://www.jooq.org" data-counter="right"></script>
+				<a href="http://www.linkedin.com/shareArticle?mini=true&url=http://www.jooq.org" target="_blank">
+	    			<img src="<?=$root?>/img/social-in.png" alt="Share jOOQ on LinkedIn" title="Share jOOQ on LinkedIn"/></a>
 			</div>
 		</div>
 
@@ -171,5 +152,6 @@ function manualHeader($isSingle, $forVersion) {
 		-->
 		<div style="display: none">
 			<img src="/img/logo.png" alt="The jOOQ Logo" title="jOOQ Logo"/>
+		</div>
 	</body>
 </html>
diff --git a/jOOQ-website/img/.gitignore b/jOOQ-website/img/.gitignore
new file mode 100644
index 0000000000..063775e2ae
--- /dev/null
+++ b/jOOQ-website/img/.gitignore
@@ -0,0 +1 @@
+/Thumbs.db
diff --git a/jOOQ-website/img/social-email-hover.png b/jOOQ-website/img/social-email-hover.png
new file mode 100644
index 0000000000..d18926c046
Binary files /dev/null and b/jOOQ-website/img/social-email-hover.png differ
diff --git a/jOOQ-website/img/social-email.png b/jOOQ-website/img/social-email.png
new file mode 100644
index 0000000000..4a37229c8c
Binary files /dev/null and b/jOOQ-website/img/social-email.png differ
diff --git a/jOOQ-website/img/social-fb-hover.png b/jOOQ-website/img/social-fb-hover.png
new file mode 100644
index 0000000000..ae733892c4
Binary files /dev/null and b/jOOQ-website/img/social-fb-hover.png differ
diff --git a/jOOQ-website/img/social-fb.png b/jOOQ-website/img/social-fb.png
new file mode 100644
index 0000000000..ae733892c4
Binary files /dev/null and b/jOOQ-website/img/social-fb.png differ
diff --git a/jOOQ-website/img/social-g+-hover.png b/jOOQ-website/img/social-g+-hover.png
new file mode 100644
index 0000000000..ce6b4261ca
Binary files /dev/null and b/jOOQ-website/img/social-g+-hover.png differ
diff --git a/jOOQ-website/img/social-g+.png b/jOOQ-website/img/social-g+.png
new file mode 100644
index 0000000000..3b74db2cd2
Binary files /dev/null and b/jOOQ-website/img/social-g+.png differ
diff --git a/jOOQ-website/img/social-in-hover.png b/jOOQ-website/img/social-in-hover.png
new file mode 100644
index 0000000000..8b838cef76
Binary files /dev/null and b/jOOQ-website/img/social-in-hover.png differ
diff --git a/jOOQ-website/img/social-in.png b/jOOQ-website/img/social-in.png
new file mode 100644
index 0000000000..1d4044e914
Binary files /dev/null and b/jOOQ-website/img/social-in.png differ
diff --git a/jOOQ-website/img/social-subscribe-hover.png b/jOOQ-website/img/social-subscribe-hover.png
new file mode 100644
index 0000000000..a578854bef
Binary files /dev/null and b/jOOQ-website/img/social-subscribe-hover.png differ
diff --git a/jOOQ-website/img/social-subscribe.png b/jOOQ-website/img/social-subscribe.png
new file mode 100644
index 0000000000..8adc0f4e41
Binary files /dev/null and b/jOOQ-website/img/social-subscribe.png differ
diff --git a/jOOQ-website/img/social-tw-hover.png b/jOOQ-website/img/social-tw-hover.png
new file mode 100644
index 0000000000..9932d128b2
Binary files /dev/null and b/jOOQ-website/img/social-tw-hover.png differ
diff --git a/jOOQ-website/img/social-tw.png b/jOOQ-website/img/social-tw.png
new file mode 100644
index 0000000000..c78af6dab6
Binary files /dev/null and b/jOOQ-website/img/social-tw.png differ