diff --git a/website/base.css b/website/base.css
index bacc5aa7..b3485dbc 100644
--- a/website/base.css
+++ b/website/base.css
@@ -153,6 +153,10 @@ h1 .description {
 	top: -15px;
 }
 
+.social div {
+	float: right;
+}
+
 .screenshot {
 	float: right;
 	background-color: #E6E6E6;
@@ -338,8 +342,8 @@ div.screencast:hover .play {
 	float: right;
 	height: 0px;
 	position: relative;
-	right: -7px;
-	top: -3px;
+	right: -6px;
+	top: -4px;
 }
 
 #donate {
diff --git a/website/cli.html b/website/cli.html
index 5a0ed355..d846e2db 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -21,19 +21,6 @@
 		
 		<!-- google plus one -->
 		<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>		
-		
-		<!-- flattr -->
-		<script type="text/javascript">
-		/* <![CDATA[ */
-		    (function() {
-		        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
-		        s.type = 'text/javascript';
-		        s.async = true;
-		        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
-		        t.parentNode.insertBefore(s, t);
-		    })();
-		/* ]]> */
-		</script>
 	</head>
 	<body>
 		<div class="page">
@@ -48,11 +35,11 @@
 			</div>
 
 			<div class="social">
-				<div class="plusone" style="display:inline; position:relative; left:25px; top:1px">
-					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])"></g:plusone>
+				<div class="twitter" style="position:relative; top:3px;">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
 				</div>
-				<div class="flattr" style="display:inline">
-					<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://filebot.sourceforge.net"></a>
+				<div class="plusone" style="position:relative; left:25px; top:1px">
+					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])"></g:plusone>
 				</div>
 			</div>
 			
diff --git a/website/index.html b/website/index.html
index 61d50b90..6a83e058 100644
--- a/website/index.html
+++ b/website/index.html
@@ -36,11 +36,11 @@
 			</div>
 
 			<div class="social">
-				<div class="plusone" style="display:inline; position:relative; left:25px; top:1px">
-					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])"></g:plusone>
+				<div class="twitter" style="position:relative; top:3px;">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
 				</div>
-				<div class="twitter" style="display:inline; position:relative; top:-1px;">
-					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer"></a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+				<div class="plusone" style="position:relative; left:25px; top:1px">
+					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])"></g:plusone>
 				</div>
 			</div>
 
diff --git a/website/naming.html b/website/naming.html
index 1cd7a17e..02063e95 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -21,19 +21,6 @@
 		
 		<!-- google plus one -->
 		<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>		
-		
-		<!-- flattr -->
-		<script type="text/javascript">
-		/* <![CDATA[ */
-		    (function() {
-		        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
-		        s.type = 'text/javascript';
-		        s.async = true;
-		        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
-		        t.parentNode.insertBefore(s, t);
-		    })();
-		/* ]]> */
-		</script>
 	</head>
 	<body>
 		<div class="page">
@@ -48,13 +35,14 @@
 			</div>
 
 			<div class="social">
-				<div class="plusone" style="display:inline; position:relative; left:25px; top:1px">
+				<div class="twitter" style="position:relative; top:3px;">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+				</div>
+				<div class="plusone" style="position:relative; left:25px; top:1px">
 					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])"></g:plusone>
 				</div>
-				<div class="flattr" style="display:inline">
-					<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://filebot.sourceforge.net"></a>
-				</div>
 			</div>
+
 			
 			<div class="header">
 				<a href="http://filebot.sourceforge.net"><img class="logo" alt="logo" src="images/icon.png" width="48" height="48" /></a>
diff --git a/website/script.html b/website/script.html
index 26101572..3d5552fd 100644
--- a/website/script.html
+++ b/website/script.html
@@ -21,19 +21,6 @@
 		
 		<!-- google plus one -->
 		<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>		
-		
-		<!-- flattr -->
-		<script type="text/javascript">
-		/* <![CDATA[ */
-		    (function() {
-		        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
-		        s.type = 'text/javascript';
-		        s.async = true;
-		        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
-		        t.parentNode.insertBefore(s, t);
-		    })();
-		/* ]]> */
-		</script>
 	</head>
 	<body>
 		<div class="page">
@@ -48,7 +35,10 @@
 			</div>
 
 			<div class="social">
-				<div class="plusone" style="display:inline; position:relative; left:25px; top:1px">
+				<div class="twitter" style="position:relative; top:3px;">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+				</div>
+				<div class="plusone" style="position:relative; left:25px; top:1px">
 					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])"></g:plusone>
 				</div>
 			</div>
