diff --git a/_less/screen.less b/_less/screen.less
index 57a0115f..97f650d9 100644
--- a/_less/screen.less
+++ b/_less/screen.less
@@ -788,6 +788,30 @@ li p{
 .previewrow .walletwarning>div>h2:first-child+span+p+p a:hover{
 	background-image:none;
 }
+.previewrow .walletinfo>div:first-child{
+	background:url(/img/bubbleinfotop.svg) bottom center no-repeat;
+}
+.previewrow .walletinfo>div:first-child+div{
+	background:url(/img/bubbleinfomiddle.svg) bottom center repeat-y;
+}
+.previewrow .walletinfo>div:first-child+div+div{
+	background:url(/img/bubbleinfobottom.svg) bottom center no-repeat;
+}
+.previewrow .walletinfo>div>h2:first-child+span+p+p a,
+.previewrow .walletinfo>div>h2:first-child+span+p+p a:link,
+.previewrow .walletinfo>div>h2:first-child+span+p+p a:visited,
+.previewrow .walletinfo>div>h2:first-child+span+p+p a:active {
+	background-color:#ee9209;
+	background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+	background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+	background-image:-moz-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+	background-image:-webkit-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+	background-image:-ms-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+	border:1px solid #d57700;
+}
+.previewrow .walletinfo>div>h2:first-child+span+p+p a:hover{
+	background-image:none;
+}
 
 h1 .rssicon{
 	vertical-align:bottom;
diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html
index f53ca9cb..321375e4 100755
--- a/_templates/choose-your-wallet.html
+++ b/_templates/choose-your-wallet.html
@@ -75,6 +75,8 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-armory.png" alt="armory" />Armory</a>
 </div>
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
 <div>
   <div>
     <div class="b1"></div>
@@ -88,6 +90,21 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-electrum.png" alt="electrum" />Electrum</a>
 </div>
+{% else %}
+<div data-id="electrum">
+  <div class="walletinfo">
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>{% translate wallettrustinfo %}</h2>
+      <span></span>
+      <p>{% translate wallettrustinfotxt %}</p>
+      <p><a href="#" onclick="walletshow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-electrum.png" alt="electrum" /></a>
+</div>
+{% endcase %}
 </div>
 
 <div class="previewrow">
@@ -104,6 +121,8 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-bitcoinwallet.png" alt="bitcoin wallet" />Bitcoin<br>Wallet</a>
 </div>
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
 <div data-id="blockchainmobile">
   <div class="walletwarning">
     <div class="b1"></div>
@@ -117,6 +136,21 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-blockchain.png" alt="blockchain.info" /></a>
 </div>
+{% else %}
+<div data-id="blockchainmobile">
+  <div class="walletinfo">
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>{% translate wallettrustinfo %}</h2>
+      <span></span>
+      <p>{% translate wallettrustinfotxt %}</p>
+      <p><a href="#" onclick="walletshow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-blockchain.png" alt="blockchain.info" /></a>
+</div>
+{% endcase %}
 <!-- FIXME hidden until paytunia website goes back online on operation
 <div data-id="paytunia">
   <div class="walletwarning">
@@ -148,6 +182,8 @@ id: choose-your-wallet
 </div>
 
 <div class="previewrow">
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
 <div data-id="blockchaindesktop">
   <div class="walletwarning">
     <div class="b1"></div>
@@ -161,6 +197,21 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-blockchain.png" alt="blockchain.info" /></a>
 </div>
+{% else %}
+<div data-id="blockchaindesktop">
+  <div class="walletinfo">
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>{% translate wallettrustinfo %}</h2>
+      <span></span>
+      <p>{% translate wallettrustinfotxt %}</p>
+      <p><a href="#" onclick="walletshow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-blockchain.png" alt="blockchain.info" /></a>
+</div>
+{% endcase %}
 <div data-id="bips">
   <div class="walletwarning">
     <div class="b1"></div>
@@ -193,6 +244,19 @@ id: choose-your-wallet
 <div class="previewcol">.</div>
 
 <div class="previewrow" style="display:none;">
+<div id="electrum">
+  <div>
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>Electrum</h2>
+      <span><img src="/img/dow-win.png" alt="Windows" title="Windows" /><img src="/img/dow-linux.png" alt="Linux" title="Linux" /><img src="/img/dow-osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/dow-android.png" alt="Android" title="Android" /></span>
+      <p>{% translate walletelectrum %}</p>
+      <p><a href="http://electrum.org/">{% translate walletvisit %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-electrum.png" alt="electrum" />Electrum</a>
+</div>
 <div id="blockchainmobile">
   <div>
     <div class="b1"></div>
diff --git a/_translations/en.yml b/_translations/en.yml
index 44de9542..127eb68e 100644
--- a/_translations/en.yml
+++ b/_translations/en.yml
@@ -155,6 +155,8 @@ en:
     walletwebwarning: "Be careful"
     walletwebwarningtxt: "Web wallets host your bitcoins. That means it is possible for them to lose your bitcoins following any incident on their side. As of today, no web wallet service provide enough insurance to be used to store value like a bank."
     walletwebwarningok: "OK, I understand"
+    wallettrustinfo: "Third party"
+    wallettrustinfotxt: "This wallet relies on a centralized service by default and requires a certain level of trust on a third party. This third party however does not control your wallet. Using backups and a strong password is always recommended when applicable."
   development:
     title: "Development - Bitcoin"
     pagetitle: "Bitcoin development"
diff --git a/css/ie.css b/css/ie.css
index 21443b56..bbc4bc26 100644
--- a/css/ie.css
+++ b/css/ie.css
@@ -344,6 +344,25 @@ body{
 	background-color:#b95357;
 	border:1px solid #a04246;
 }
+.previewrow .walletinfo .b1{
+	background-image:url(/img/bubblewarntop.png);
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/img/bubbleinfotop.png', sizingMethod='scale');
+}
+.previewrow .walletinfo .b2{
+	background-image:url(/img/bubblewarnmiddle.png);
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/img/bubbleinfomiddle.png', sizingMethod='scale');
+}
+.previewrow .walletinfo .b3{
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/img/bubbleinfobottom.png', sizingMethod='scale');
+}
+.previewrow .walletinfo div p a,
+.previewrow .walletinfo div p a:visited,
+.previewrow .walletinfo div p a:link,
+.previewrow .walletinfo div p a:active{
+	background-color:#ee9209;
+	border:1px solid #d57700;
+	
+}
 
 .press-volunteer div div{
 	width: 400px;
diff --git a/img/bubbleinfo.svg b/img/bubbleinfo.svg
new file mode 100644
index 00000000..4bdb18de
--- /dev/null
+++ b/img/bubbleinfo.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="280"
+   height="280"
+   id="svg4147"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="bubbleinfo.svg">
+  <defs
+     id="defs4149" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="106.84315"
+     inkscape:cy="100.89976"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4152">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-772.36218)">
+    <path
+       style="fill:#fff8ea;fill-opacity:1;fill-rule:nonzero;stroke:#ee9209;stroke-width:2.49500000000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.48500000000000032, 2.49500000000000011;stroke-dashoffset:0"
+       d="m 1.2851726,773.6355 -0.024107,221.49684 140.2013639,55.96826 137.27276,-53.51078 -0.001,-223.9599 z"
+       id="path4155"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/img/bubbleinfobottom.png b/img/bubbleinfobottom.png
new file mode 100644
index 00000000..266b97ed
Binary files /dev/null and b/img/bubbleinfobottom.png differ
diff --git a/img/bubbleinfobottom.svg b/img/bubbleinfobottom.svg
new file mode 100644
index 00000000..08162714
--- /dev/null
+++ b/img/bubbleinfobottom.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="280"
+   height="64"
+   id="svg4147"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="bubbleinfobottom.svg">
+  <defs
+     id="defs4149" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="49.64031"
+     inkscape:cy="118.60676"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4152">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.3622)">
+    <path
+       style="fill:#fff8ea;fill-opacity:1;fill-rule:nonzero;stroke:#ee9209;stroke-width:2.49528980000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.48586986000000021, 2.49528995000000009;stroke-dashoffset:0"
+       d="m 1.2851726,772.39699 -0.024107,221.4968 140.2013644,55.96831 137.27276,-53.51081 -10e-4,-223.9599 z"
+       id="path4155"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/img/bubbleinfomiddle.png b/img/bubbleinfomiddle.png
new file mode 100644
index 00000000..887ebb8d
Binary files /dev/null and b/img/bubbleinfomiddle.png differ
diff --git a/img/bubbleinfomiddle.svg b/img/bubbleinfomiddle.svg
new file mode 100644
index 00000000..a8ea6167
--- /dev/null
+++ b/img/bubbleinfomiddle.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="280"
+   height="10"
+   id="svg4147"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="bubbleinfomiddle.svg">
+  <defs
+     id="defs4149" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="-50.306227"
+     inkscape:cy="-12.801804"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4152">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3622)">
+    <path
+       style="fill:#fff8ea;fill-opacity:1;fill-rule:nonzero;stroke:#ee9209;stroke-width:2.49500000000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.48500000000000032, 2.49500000000000011;stroke-dashoffset:0"
+       d="m 1.2851726,834.04016 -0.024107,221.49674 140.2013644,55.9683 137.27276,-53.5108 -10e-4,-223.95984 z"
+       id="path4155"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/img/bubbleinfotop.png b/img/bubbleinfotop.png
new file mode 100644
index 00000000..f0fd0f40
Binary files /dev/null and b/img/bubbleinfotop.png differ
diff --git a/img/bubbleinfotop.svg b/img/bubbleinfotop.svg
new file mode 100644
index 00000000..b684f657
--- /dev/null
+++ b/img/bubbleinfotop.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="280"
+   height="10"
+   id="svg4147"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="bubbleinfotop.svg">
+  <defs
+     id="defs4149" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="267.92324"
+     inkscape:cy="-196.6162"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4152">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3622)">
+    <path
+       style="fill:#fff8ea;fill-opacity:1;fill-rule:nonzero;stroke:#ee9209;stroke-width:2.49500000000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.48500000000000032, 2.49500000000000011;stroke-dashoffset:0"
+       d="m 1.2851726,1043.6331 -0.024107,221.4968 140.2013644,55.9683 137.27276,-53.5108 -10e-4,-223.9599 z"
+       id="path4155"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/js/main.js b/js/main.js
index eaefc6b1..fb460f23 100644
--- a/js/main.js
+++ b/js/main.js
@@ -72,7 +72,7 @@ d.getElementsByTagName('P')[1].getElementsByTagName('A')[0].href=s.getElementsBy
 d.getElementsByTagName('P')[1].getElementsByTagName('A')[0].onclick='';
 d.className='';
 //Workaround for browsers that don't handle re-rendering class styles and svg (they have backgroundImage hardcoded in HTML)
-for(var ii=0,nn=d.childNodes.length;ii<nn;ii++){if(d.childNodes[ii].nodeType==1&&d.childNodes[ii].style.backgroundImage!='')d.childNodes[ii].style.backgroundImage=d.childNodes[ii].style.backgroundImage.replace('bubblewarn','bubble');}
+for(var ii=0,nn=d.childNodes.length;ii<nn;ii++){if(d.childNodes[ii].nodeType==1&&d.childNodes[ii].style.backgroundImage!='')d.childNodes[ii].style.backgroundImage=d.childNodes[ii].style.backgroundImage.replace('bubblewarn','bubble').replace('bubbleinfo','bubble');}
 for(var ii=0,as=d.parentNode.getElementsByTagName('A'),nn=as.length;ii<nn;ii++){if(as[ii].parentNode==d.parentNode){var dd=as[ii];break;}}
 for(var ii=0,as=s.parentNode.getElementsByTagName('A'),nn=as.length;ii<nn;ii++){if(as[ii].parentNode==s.parentNode){var ss=as[ii];break;}}
 dd.innerHTML=ss.innerHTML;