diff --git a/module/doc/js/view.js b/module/doc/js/view.js
index 8d0b160e7f..85b34ad061 100644
--- a/module/doc/js/view.js
+++ b/module/doc/js/view.js
@@ -6,7 +6,22 @@ $(function()
         $('#urlIframe').height(defaultHeight);
         setTimeout($.resetToolbarPosition, 50);
     }
-    $('body').addClass('doc-fullscreen');
+
+    if($.cookie('fullscreen') == 'true') 
+    {
+        $('body').addClass('doc-fullscreen');
+        $('.side-col').addClass('hidden');
+        $('#mainContent .fullscreen-btn').attr('title', retrack);
+        $('#mainContent .fullscreen-btn').html('<i class="icon icon-fullscreen"></i> ' + retrack);
+    }
+    else
+    {
+        $('body').removeClass('doc-feullscreen');
+        $('.side-col').removeClass('hidden');
+        $('#mainContent .fullscreen-btn').attr('title', fullscreen);
+        $('#mainContent .fullscreen-btn').html('<i class="icon icon-fullscreen"></i> ' + fullscreen);
+    }
+
     $('#mainContent .fullscreen-btn').click(function()
     {
         $('.side-col').toggleClass('hidden');
@@ -14,10 +29,14 @@ $(function()
         if($('body').hasClass('doc-fullscreen')) 
         {
             $('#mainContent .fullscreen-btn').attr('title', retrack);
+            $('#mainContent .fullscreen-btn').html('<i class="icon icon-fullscreen"></i> ' + retrack);
+            $.cookie('fullscreen', 'true');
         }
         else
         {
             $('#mainContent .fullscreen-btn').attr('title', fullscreen);
+            $('#mainContent .fullscreen-btn').html('<i class="icon icon-fullscreen"></i> ' + fullscreen);
+            $.cookie('fullscreen', 'false');
         }
         setTimeout($.resetToolbarPosition, 50);
     });
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index fe016ecf38..be7071246a 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -131,7 +131,7 @@ js::set('sysurl', common::getSysUrl());
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
         <div class='divider'></div>
-        <button type='button' class='btn fullscreen-btn' title='<?php echo $lang->doc->retrack;?>'><i class='icon icon-fullscreen'></i></button>
+            <button type='button' class='btn fullscreen-btn' title='<?php echo $lang->doc->retrack;?>'><i class='icon icon-fullscreen'></i><?php echo ' ' . $lang->doc->retrack;?></button>
         <?php
         if(!$doc->deleted)
         {