diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index 240b4a00..c1eac127 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -12,7 +12,7 @@
     <tr>
       <th scope="row">Expected</th>
 {section block $BLOCKSFOUND step=-1}
-      <td>{round(65536 * $BLOCKSFOUND[block].difficulty)}</td>
+      <td>{$BLOCKSFOUND[block].estshares}</td>
 {/section}
     </tr>
     <tr>
@@ -64,16 +64,15 @@ target and network difficulty and assuming a zero variance scenario.
         {else}{$GLOBAL.confirmations - $BLOCKSFOUND[block].confirmations} left{/if}</td>
         <td>{if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}</td>
         <td class="center">{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}</td>
-        <td class="right">{$BLOCKSFOUND[block].difficulty|number_format:"2"}</td>
+        <td class="right">{$BLOCKSFOUND[block].difficulty|number_format:"8"}</td>
         <td class="right">{$BLOCKSFOUND[block].amount|number_format:"2"}</td>
         <td class="right">
-        {math assign="estshares" equation="(65536 * blockdiff)" blockdiff=$BLOCKSFOUND[block].difficulty}
-      	{assign var="totalexpectedshares" value=$totalexpectedshares+$estshares}
-        {$estshares|number_format}
+        {$BLOCKSFOUND[block].estshares|number_format}
+      	{assign var="totalexpectedshares" value=$totalexpectedshares+$BLOCKSFOUND[block].estshares}
         </td>
         <td class="right">{$BLOCKSFOUND[block].shares|number_format}</td>
         <td class="right">
-          {math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares estshares=$estshares}
+          {math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares estshares=$BLOCKSFOUND[block].estshares}
 	  {assign var="totalpercentage" value=$totalpercentage+$percentage}
           <font color="{if ($percentage <= 100)}green{else}red{/if}">{$percentage|number_format:"2"}</font>
         </td>
diff --git a/public/templates/mmcFE/statistics/pool/authenticated.tpl b/public/templates/mmcFE/statistics/pool/authenticated.tpl
index 83ee505c..ff87137a 100644
--- a/public/templates/mmcFE/statistics/pool/authenticated.tpl
+++ b/public/templates/mmcFE/statistics/pool/authenticated.tpl
@@ -48,7 +48,8 @@
     </tr>
     <tr>
       <td class="leftheader">Est. Shares this Round</td>
-      <td>{(65536 * $DIFFICULTY)|number_format:"0"} <font size="1">(done: {(100 / (65536 * $DIFFICULTY) * $GLOBAL.roundshares.valid)|number_format:"2"} %)</td>
+      {assign var=estshares value=(65536 * $DIFFICULTY) / pow(2, ($GLOBAL.config.targetdiff - 16))}
+      <td>{$estshares|number_format:"0"} <font size="1">(done: {(100 / $estshares * $GLOBAL.roundshares.valid)|number_format:"2"} %)</td>
     </tr>
     <tr>
       <td class="leftheader">Time Since Last Block</td>
diff --git a/public/templates/mobile/statistics/pool/authenticated.tpl b/public/templates/mobile/statistics/pool/authenticated.tpl
index d9e490b2..69588d9f 100644
--- a/public/templates/mobile/statistics/pool/authenticated.tpl
+++ b/public/templates/mobile/statistics/pool/authenticated.tpl
@@ -51,7 +51,7 @@
     </tr>
     <tr>
       <td class="leftheader">Est. Shares this Round</td>
-      <td>{(65536 * $DIFFICULTY)|number_format:"0"} <font size="1">(done: {(100 / (65536 * $DIFFICULTY) * $GLOBAL.roundshares.valid)|number_format:"2"} %)</td>
+      <td>{((65536 * $DIFFICULTY) / pow(2, ($GLOBAL.config.targetdiff - 16)))|number_format:"0"} <font size="1">(done: {(100 / ((65536 * $DIFFICULTY) / pow(2, ($GLOBAL.config.targetdiff - 16))) * $GLOBAL.roundshares.valid)|number_format:"2"} %)</td>
     </tr>
     <tr>
       <td class="leftheader">Time Since Last Block</td>