diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php
index 6d7bef3fd7..5572e7c853 100644
--- a/module/backup/view/index.html.php
+++ b/module/backup/view/index.html.php
@@ -36,7 +36,7 @@
         <?php echo $lang->backup->history?>
       </h2>
       <div class='pull-right'>
-        <?php common::printLink('backup', 'setting', '', "<i class='icon icon-cog'></i>" . $lang->backup->setting, '', "data-width='500' class='iframe btn btn-primary'");?>
+        <?php common::printLink('backup', 'setting', '', "<i class='icon icon-cog'></i> " . $lang->backup->setting, '', "data-width='500' class='iframe btn btn-primary'");?>
         <?php common::printLink('backup', 'backup', 'reload=yes', "<i class='icon icon-copy'></i> " . $lang->backup->backup, 'hiddenwin', "class='btn btn-primary backup'");?>
       </div>
     </div>
diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index 40f7d58547..0445263b63 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -157,7 +157,7 @@ $(function()
               </div>
               <?php else:?>
               <div class="actions">
-                <?php common::printLink('productplan', 'create', "productID={$product->id}", "<i class='icon icon-plus'></i>" . $lang->productplan->create, '', "class='btn btn-info'");?>
+                <?php common::printLink('productplan', 'create', "productID={$product->id}", "<i class='icon icon-plus'></i> " . $lang->productplan->create, '', "class='btn btn-info'");?>
               </div>
               <?php endif;?>
               <div class="type-info">
@@ -190,7 +190,7 @@ $(function()
               </div>
               <?php else:?>
               <div class="actions">
-                <?php common::printLink('release', 'create', "productID={$product->id}", "<i class='icon icon-plus'></i>" . $lang->release->create, '', "class='btn btn-info'");?>
+                <?php common::printLink('release', 'create', "productID={$product->id}", "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
               </div>
               <?php endif;?>
               <div class="type-info">
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 2eb9bc2557..2356adcc4c 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -181,7 +181,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
         <li <?php echo $disabled?>>
         <?php
           $batchLink = $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&executionID=0&moduleID=$moduleID");
-          echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->bug->batchCreate) . "</li>";
+          echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->bug->batchCreate) . "</li>";
         ?>
         </li>
       </ul>
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 10db781752..118c64ed1a 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&branch=0&browseType=$browseType&moduleID=$moduleID"), "<i class='icon icon-back icon-sm'> </i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&branch=0&browseType=$browseType&moduleID=$moduleID"), "<i class='icon icon-back icon-sm'> </i> " . $lang->goback, '', "class='btn btn-link'");?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='text'><?php echo $lang->bug->report->common;?></span>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 6c0bf203ad..2f3277774f 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -32,7 +32,7 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)):?>
     <?php $openApp = strpos('|execution|project|qa|', $this->app->openApp) !== false ? $this->app->openApp : 'qa';?>
-    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module},projectID={$bug->project},executionID={$bug->execution}", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
+    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module},projectID={$bug->project},executionID={$bug->execution}", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index cf3f8f97b7..e4e94f5217 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -51,16 +51,16 @@ js::set('flow',          $config->global->flow);
     if(common::hasPriv('caselib', 'view'))
     {
         $link = helper::createLink('caselib', 'view', "libID=$libID");
-        echo html::a($link, "<i class='icon icon-list-alt muted'> </i>" . $this->lang->caselib->view, '', "class='btn btn-link'");
+        echo html::a($link, "<i class='icon icon-list-alt muted'> </i> " . $this->lang->caselib->view, '', "class='btn btn-link'");
     }
     ?>
   </div>
   <div class='btn-toolbar pull-right'>
     <div class='btn-group'>
-     <?php common::printLink('caselib', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i>" . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='40%'");?>
-     <?php common::printLink('caselib', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i>" . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
+     <?php common::printLink('caselib', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i> " . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='40%'");?>
+     <?php common::printLink('caselib', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i> " . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
     </div>
-    <?php echo html::a($this->createLink('caselib', 'create'), "<i class='icon icon-plus'> </i>" . $lang->caselib->create, '', 'class="btn btn-secondary"');?>
+    <?php echo html::a($this->createLink('caselib', 'create'), "<i class='icon icon-plus'> </i> " . $lang->caselib->create, '', 'class="btn btn-secondary"');?>
     <div class='btn-group dropdown'>
       <?php
       $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);
diff --git a/module/doc/model.php b/module/doc/model.php
index 607d2ab4e3..23df31ffeb 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1748,12 +1748,12 @@ class docModel extends model
     {
         if($objectType == 'book')
         {
-            $html = html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), '<i class="icon icon-plus"></i>' . $this->lang->doc->createBook, '', 'class="btn btn-secondary iframe"');
+            $html = html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), '<i class="icon icon-plus"></i> ' . $this->lang->doc->createBook, '', 'class="btn btn-secondary iframe"');
         }
         elseif($libID)
         {
             $html  = "<div class='dropdown' id='createDropdown'>";
-            $html .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->createAB . " <span class='caret'></span></button>";
+            $html .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> " . $this->lang->doc->createAB . " <span class='caret'></span></button>";
             $html .= "<ul class='dropdown-menu pull-right'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
@@ -1812,7 +1812,7 @@ class docModel extends model
             if($doc->type == 'project')   $objectID = $doc->project;
             if($doc->type == 'execution') $objectID = $doc->execution;
 
-            $html .= '<li>' . html::a(inlink('objectLibs', "type={$doc->type}&objectID=$objectID&libID={$doc->lib}&docID={$doc->id}"), "<i class='icon icon-file-text'></i>" . $doc->title, '', "data-app='{$this->app->openApp}' title='{$doc->title}'") . '</li>';
+            $html .= '<li>' . html::a(inlink('objectLibs', "type={$doc->type}&objectID=$objectID&libID={$doc->lib}&docID={$doc->id}"), "<i class='icon icon-file-text'></i> " . $doc->title, '', "data-app='{$this->app->openApp}' title='{$doc->title}'") . '</li>';
         }
 
         $collectionCount = $this->dao->select('count(id) as count')->from(TABLE_DOC)
@@ -1856,7 +1856,7 @@ class docModel extends model
     public function setFastMenu($fastLib)
     {
         $actions  = '';
-        $actions .= '<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i>' . $this->lang->doc->search . '</a>';
+        $actions .= '<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> ' . $this->lang->doc->search . '</a>';
         $actions .= "<a data-toggle='dropdown' class='btn btn-link' title=$fastLib>" . $fastLib . " <span class='caret'></span></a>";
         $actions .= "<ul class='dropdown-menu'>";
         foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index 00ee23b6ea..ec84a042cb 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -20,9 +20,9 @@
           <div class="dropdown">
             <button class="btn" type="button" data-toggle="dropdown"><i class='icon-cog'></i> <span class="caret"></span></button>
             <ul class='dropdown-menu'>
-              <li><?php common::printLink('tree', 'browse', "libID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i>" . $lang->doc->manageType);?></li>
-              <li><?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>" . $lang->doc->editlib, '', "class='iframe'");?></li>
-              <li><?php common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>" . $lang->doc->deleteLib, 'hiddenwin');?></li>
+              <li><?php common::printLink('tree', 'browse', "libID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i> " . $lang->doc->manageType);?></li>
+              <li><?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i> " . $lang->doc->editlib, '', "class='iframe'");?></li>
+              <li><?php common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i> " . $lang->doc->deleteLib, 'hiddenwin');?></li>
             </ul>
           </div>
           <?php if(common::hasPriv('doc', 'create')):?>
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index 59ec416304..af2c7efee4 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -78,12 +78,12 @@ if(empty($type)) $type = 'product';
         $html = '';
         if($type == 'book' and common::hasPriv('doc', 'createLib'))
         {
-            $html = html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), '<i class="icon icon-plus"></i>' . $this->lang->doc->createBook, '', 'class="btn btn-info btn-wide iframe"');
+            $html = html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), '<i class="icon icon-plus"></i> ' . $this->lang->doc->createBook, '', 'class="btn btn-info btn-wide iframe"');
         }
         elseif($libID and common::hasPriv('doc', 'create'))
         {
             $html  = "<div class='dropdown' id='createDropdown'>";
-            $html .= "<button class='btn btn-info btn-wide' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->createAB . " <span class='caret'></span></button>";
+            $html .= "<button class='btn btn-info btn-wide' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> " . $this->lang->doc->createAB . " <span class='caret'></span></button>";
             $html .= "<ul class='dropdown-menu' style='left:0px'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index eab25a40f5..af09f67cda 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -33,7 +33,7 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
     <?php endforeach;?>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=$from", "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export'")?>
+    <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=$from", "<i class='icon-export muted'> </i> " . $lang->export, '', "class='btn btn-link export'")?>
     <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary' data-app='$from'");?>
   </div>
 </div>
diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index 2a87a5589a..84afd362bf 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -25,7 +25,7 @@
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&executionID=$execution->id", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
+    <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&executionID=$execution->id", "<i class='icon icon-export muted'> </i> " . $lang->bug->export, '', "class='btn btn-link export'");?>
     <?php if(common::canModify('execution', $execution)) common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extras=executionID=$execution->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 49307adf4f..5db8444efb 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -41,7 +41,7 @@
     $checkObject->execution = $executionID;
     $misc = common::hasPriv('task', 'create', $checkObject) ? "class='btn btn-primary iframe' data-width='1200px'" : "class='btn btn-primary disabled'";
     $link = common::hasPriv('task', 'create', $checkObject) ?  $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''), '', true) : '#';
-    echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->create, '', $misc);
+    echo html::a($link, "<i class='icon icon-plus'></i> " . $lang->task->create, '', $misc);
     ?>
     <?php endif;?>
   </div>
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 8443f62667..25942972aa 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -171,7 +171,7 @@ body {margin-bottom: 25px;}
       <li <?php echo $disabled?>>
       <?php
         $batchLink = $this->createLink('task', 'batchCreate', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
-        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->task->batchCreate) . "</li>";
+        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->task->batchCreate) . "</li>";
       ?>
       </li>
     </ul>
diff --git a/module/execution/view/taskheader.html.php b/module/execution/view/taskheader.html.php
index 1c298bd1cd..c613a8bf5b 100644
--- a/module/execution/view/taskheader.html.php
+++ b/module/execution/view/taskheader.html.php
@@ -84,7 +84,7 @@
   </ul>
   <div class='actions'>
     <div class='btn-group'>
-      <?php 
+      <?php
       if(!isset($browseType)) $browseType = '';
       if(!isset($orderBy))    $orderBy = '';
       common::printIcon('task', 'report', "execution=$executionID&browseType=$browseType");
@@ -96,7 +96,7 @@
             <span class='caret'></span>
         </button>
         <ul class='dropdown-menu' id='exportActionMenu'>
-        <?php 
+        <?php
         $misc = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
         $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "execution=$executionID&orderBy=$orderBy&type=$browseType") : '#';
         echo "<li>" . html::a($link, $lang->task->export, '', $misc) . "</li>";
@@ -110,7 +110,7 @@
             <span class='caret'></span>
         </button>
         <ul class='dropdown-menu' id='importActionMenu'>
-        <?php 
+        <?php
         $misc = common::hasPriv('execution', 'importTask') ? '' : "class=disabled";
         $link = common::hasPriv('execution', 'importTask') ?  $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
@@ -124,12 +124,12 @@
     </div>
     <div class='btn-group'>
       <div class='btn-group' id='createActionMenu'>
-        <?php 
+        <?php
         $checkObject = new stdclass();
         $checkObject->execution = $executionID;
         $misc = common::hasPriv('task', 'create', $checkObject) ? "class='btn btn-primary'" : "class='btn btn-primary disabled'";
         $link = common::hasPriv('task', 'create', $checkObject) ?  $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
-        echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->create, '', $misc);
+        echo html::a($link, "<i class='icon icon-plus'></i> " . $lang->task->create, '', $misc);
 
         $misc = common::hasPriv('task', 'batchCreate', $checkObject) ? '' : "disabled";
         $link = common::hasPriv('task', 'batchCreate', $checkObject) ?  $this->createLink('task', 'batchCreate', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
diff --git a/module/execution/view/tree.html.php b/module/execution/view/tree.html.php
index e6a668cab2..95226cf5c1 100644
--- a/module/execution/view/tree.html.php
+++ b/module/execution/view/tree.html.php
@@ -57,7 +57,7 @@
     $checkObject->execution = $executionID;
     $misc = common::hasPriv('task', 'create', $checkObject) ? "class='btn btn-primary'" : "class='btn btn-primary disabled'";
     $link = common::hasPriv('task', 'create', $checkObject) ?  $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
-    echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->create, '', $misc);
+    echo html::a($link, "<i class='icon icon-plus'></i> " . $lang->task->create, '', $misc);
     ?>
   </div>
 </div>
diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php
index 6291704cda..dd4c75a106 100644
--- a/module/personnel/view/whitelist.html.php
+++ b/module/personnel/view/whitelist.html.php
@@ -20,7 +20,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php $vars = $module == 'program' ? "objectID=$objectID&deptID=0&programID=$programID&from=$from" : "objectID=$objectID";?>
-    <?php common::printLink($module, 'addWhitelist', $vars, "<i class='icon icon-plus'></i>" . $lang->personnel->addWhitelist, '', "class='btn btn-primary' $openApp");?>
+    <?php common::printLink($module, 'addWhitelist', $vars, "<i class='icon icon-plus'></i> " . $lang->personnel->addWhitelist, '', "class='btn btn-primary' $openApp");?>
   </div>
 </div>
 <div id='mainContent' class='main-row fade'>
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 47ec434873..19e5d44450 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -20,7 +20,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('product', 'manageLine', '', "<i class='icon-edit'></i> &nbsp;" . $lang->product->line, '', 'class="btn btn-link iframe"', '', true);?>
-    <?php common::printLink('product', 'create', '', '<i class="icon icon-plus"></i>' . $lang->product->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('product', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->product->create, '', 'class="btn btn-primary"');?>
   </div>
 </div>
 <div id="mainContent" class="main-row fade">
diff --git a/module/program/control.php b/module/program/control.php
index 9daaaf03d7..0efabdc13c 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -28,7 +28,7 @@ class program extends control
      */
     public function browse($status = 'all', $orderBy = 'order_asc')
     {
-        if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-plus'></i>" . $this->lang->program->create, '', "class='btn btn-primary'");
+        if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-primary'");
 
         $this->session->set('programList', $this->app->getURI(true), 'program');
         $this->session->set('projectList', $this->app->getURI(true), 'project');
diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php
index 3059e465f2..1003efc783 100644
--- a/module/program/view/browse.html.php
+++ b/module/program/view/browse.html.php
@@ -27,9 +27,9 @@
   </div>
   <div class='pull-right'>
     <?php if(isset($this->config->maxVersion)):?>
-    <?php common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?>
+    <?php common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?>
     <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', "mode=scrum&programID=0", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-secondary"');?>
+    <?php common::printLink('project', 'create', "mode=scrum&programID=0", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-secondary"');?>
     <?php endif;?>
     <?php if(isset($lang->pageActions)) echo $lang->pageActions;?>
   </div>
diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php
index 8e726647fe..8984018b8d 100644
--- a/module/program/view/product.html.php
+++ b/module/program/view/product.html.php
@@ -21,7 +21,7 @@
     <?php endforeach;?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('product', 'create', "programID=$program->id", '<i class="icon icon-plus"></i>' . $lang->product->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('product', 'create', "programID=$program->id", '<i class="icon icon-plus"></i> ' . $lang->product->create, '', 'class="btn btn-primary"');?>
   </div>
   <?php endif;?>
 </div>
diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php
index 6abb22e1a5..3b82bc8ecb 100644
--- a/module/program/view/project.html.php
+++ b/module/program/view/project.html.php
@@ -31,9 +31,9 @@ js::set('browseType', $browseType);
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(isset($this->config->maxVersion)):?>
-    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
+    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
     <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary"');?>
     <?php endif;?>
   </div>
 </div>
@@ -44,9 +44,9 @@ js::set('browseType', $browseType);
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
         <?php if(isset($this->config->maxVersion)):?>
-        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
+        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
         <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
+        <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
         <?php endif;?>
       </p>
     </div>
diff --git a/module/program/view/stakeholder.html.php b/module/program/view/stakeholder.html.php
index 291e500763..05f4574d08 100644
--- a/module/program/view/stakeholder.html.php
+++ b/module/program/view/stakeholder.html.php
@@ -17,7 +17,7 @@
     <?php echo html::a($this->createLink('program', 'stakeholder', "programID=$programID"), '<span class="text">' . $lang->program->stakeholder . '</span>', '', 'class="btn btn-link btn-active-text"');?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('stakeholder', 'create', "programID=$programID", "<i class='icon icon-plus'></i>" . $lang->program->createStakeholder, '', "class='btn btn-primary'");?>
+    <?php common::printLink('stakeholder', 'create', "programID=$programID", "<i class='icon icon-plus'></i> " . $lang->program->createStakeholder, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id='mainContent' class='main-row fade'>
diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php
index 5e2576196d..c88631f78a 100644
--- a/module/project/view/browsebycard.html.php
+++ b/module/project/view/browsebycard.html.php
@@ -27,11 +27,11 @@
       <?php echo html::a('#',"<i class='icon-list'></i> &nbsp;", '', "class='btn btn-icon' title='{$lang->project->bylist}' id='switchButton' data-type='bylist'");?>
     </div>
     <?php if(isset($this->config->maxVersion)):?>
-    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
+    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
     <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary"');?>
     <?php else:?>
-    <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i>' . $lang->execution->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-primary"');?>
     <?php endif;?>
   </div>
 </div>
@@ -42,11 +42,11 @@
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
         <?php if(isset($this->config->maxVersion)):?>
-        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
+        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
         <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info"');?>
+        <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info"');?>
         <?php else:?>
-        <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i>' . $lang->execution->create, '', 'class="btn btn-info"');?>
+        <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-info"');?>
         <?php endif;?>
       </p>
     </div>
diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index ca451913f1..3964ea8443 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -38,11 +38,11 @@
       <?php echo html::a('#',"<i class='icon-list'></i> &nbsp;", '', "class='btn btn-icon text-primary' title='{$lang->project->bylist}' id='switchButton' data-type='bylist'");?>
     </div>
     <?php if(isset($this->config->maxVersion)):?>
-    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
+    <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
     <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary"');?>
     <?php else:?>
-    <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i>' . $lang->execution->create, '', 'class="btn btn-primary"');?>
+    <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-primary"');?>
     <?php endif;?>
   </div>
 </div>
@@ -64,11 +64,11 @@
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
         <?php if(isset($this->config->maxVersion)):?>
-        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
+        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
         <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info"');?>
+        <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info"');?>
         <?php else:?>
-        <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i>' . $lang->execution->create, '', 'class="btn btn-info"');?>
+        <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-info"');?>
         <?php endif;?>
       </p>
     </div>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index aa454ec187..2fd37b292e 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -25,7 +25,7 @@
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&projectID=$project->id", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
+    <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&projectID=$project->id", "<i class='icon icon-export muted'> </i> " . $lang->bug->export, '', "class='btn btn-link export'");?>
     <?php if(common::canModify('project', $project)) common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extras=projectID=$project->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
diff --git a/module/repo/view/blame.html.php b/module/repo/view/blame.html.php
index dd129dc110..2a6a578079 100644
--- a/module/repo/view/blame.html.php
+++ b/module/repo/view/blame.html.php
@@ -20,11 +20,11 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
     $backURI = $this->session->repoView ? $this->session->repoView : $this->session->repoList;
     if($backURI)
     {
-        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
+        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
     }
     else
     {
-        echo html::backButton("<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', 'btn btn-link');
+        echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', 'btn btn-link');
     }
     ?>
     <div class="divider"></div>
diff --git a/module/repo/view/diff.html.php b/module/repo/view/diff.html.php
index 0eb648aa81..83b1545476 100644
--- a/module/repo/view/diff.html.php
+++ b/module/repo/view/diff.html.php
@@ -18,11 +18,11 @@
     $backURI = $this->session->repoView ? $this->session->repoView : $this->session->repoList;
     if($backURI)
     {
-        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
+        echo html::a($backURI, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");
     }
     else
     {
-        echo html::backButton("<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "btn btn-link");
+        echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "btn btn-link");
     }
     ?>
     <div class="divider"></div>
diff --git a/module/repo/view/log.html.php b/module/repo/view/log.html.php
index 4e780f9653..a1e63fd377 100644
--- a/module/repo/view/log.html.php
+++ b/module/repo/view/log.html.php
@@ -13,7 +13,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class="btn-toolbar pull-left">
     <?php
-    echo html::backButton("<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', 'btn btn-link');
+    echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', 'btn btn-link');
     echo '<div class="divider"></div>';
     ?>
     <div class="page-title">
diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php
index ffe68e3566..ff9fd57386 100644
--- a/module/repo/view/revision.html.php
+++ b/module/repo/view/revision.html.php
@@ -20,7 +20,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php $browseLink = $app->session->revisionList != false ? $app->session->revisionList : $this->repo->createLink('browse', "repoID={$repoID}&branchID=" . base64_encode($branchID) . "&objectID=$objectID{$preDir}");?>
-    <?php echo html::a($browseLink, "<i class='icon icon-back'></i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php echo html::a($browseLink, "<i class='icon icon-back'></i> " . $lang->goback, '', "class='btn btn-link'");?>
     <div class="divider"></div>
     <div class="page-title">
       <?php echo $lang->repo->revisionA . ' ' . ($repo->SCM == 'Subversion' ? $revision : $this->repo->getGitRevisionName($revision, $log->commit));?>
diff --git a/module/repo/view/view.html.php b/module/repo/view/view.html.php
index 76a95b3faf..44660ad276 100644
--- a/module/repo/view/view.html.php
+++ b/module/repo/view/view.html.php
@@ -20,7 +20,7 @@ $version = " <span class=\"label label-info\">$revisionName</span>";
 <?php if(!isonlybody()):?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::a($this->session->repoList, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");?>
+    <?php echo html::a($this->session->repoList, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-link' data-app='{$app->openApp}'");?>
     <div class="divider"></div>
     <div class="page-title">
       <strong>
diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php
index 07b3f5e308..8675a04b87 100644
--- a/module/stakeholder/view/browse.html.php
+++ b/module/stakeholder/view/browse.html.php
@@ -17,8 +17,8 @@
     <?php echo html::a($this->createLink('stakeholder', 'browse', 'browseType=all'), '<span class="text">' . $lang->stakeholder->browse . '</span>', '', 'class="btn btn-link btn-active-text"');?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('stakeholder', 'batchcreate', "projectID=$projectID", "<i class='icon icon-plus'></i>" . $lang->stakeholder->batchCreate, '', "class='btn btn-primary'");?>
-    <?php common::printLink('stakeholder', 'create', "projectID=$projectID", "<i class='icon icon-plus'></i>" . $lang->stakeholder->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('stakeholder', 'batchcreate', "projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->stakeholder->batchCreate, '', "class='btn btn-primary'");?>
+    <?php common::printLink('stakeholder', 'create', "projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->stakeholder->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id='mainContent' class='main-row fade'>
diff --git a/module/stakeholder/view/userissue.html.php b/module/stakeholder/view/userissue.html.php
index 7564f1f472..8cd666e3eb 100644
--- a/module/stakeholder/view/userissue.html.php
+++ b/module/stakeholder/view/userissue.html.php
@@ -18,7 +18,7 @@
         <span><?php echo $lang->stakeholder->viewIssue;?></span>
       </h2>
       <div class="pull-right">
-        <?php common::printLink('issue', 'create', "projectID=$projectID&from=stakeholder&owner=" . $stakeholder->user, "<i class='icon icon-plus'></i>" . $lang->issue->create, '', "class='btn btn-primary'");?>
+        <?php common::printLink('issue', 'create', "projectID=$projectID&from=stakeholder&owner=" . $stakeholder->user, "<i class='icon icon-plus'></i> " . $lang->issue->create, '', "class='btn btn-primary'");?>
       </div>
     </div>
   </div>
diff --git a/module/stakeholder/view/view.html.php b/module/stakeholder/view/view.html.php
index f74de985d5..01be63f2d0 100644
--- a/module/stakeholder/view/view.html.php
+++ b/module/stakeholder/view/view.html.php
@@ -19,7 +19,7 @@ $createLink = $this->createLink('stakeholder', 'create', "projectID=$user->objec
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i>' . $lang->goback, '', 'class="btn btn-secondary"');?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'class="btn btn-secondary"');?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">
diff --git a/module/stakeholder/view/viewissue.html.php b/module/stakeholder/view/viewissue.html.php
index 98e05d877b..91ed3a2677 100644
--- a/module/stakeholder/view/viewissue.html.php
+++ b/module/stakeholder/view/viewissue.html.php
@@ -12,12 +12,12 @@ table td{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
         <?php endif;?>
       </h2>
       <div class='pull-right'>
-        <?php common::printLink('issue', 'create', 'owner=show&account=&activityID=' . $activity->id, "<i class='icon icon-plus'></i>" . $lang->issue->create, '', "class='btn btn-primary'");?>
+        <?php common::printLink('issue', 'create', 'owner=show&account=&activityID=' . $activity->id, "<i class='icon icon-plus'></i> " . $lang->issue->create, '', "class='btn btn-primary'");?>
       </div>
     </div>
     <?php if(!empty($issues)):?>
     <table class='table'>
-      <thead> 
+      <thead>
         <tr>
           <th class='w-50px'><?php echo $lang->issue->id;?></th>
           <th class='w-100px'><?php echo $lang->issue->type;?></th>
@@ -27,8 +27,8 @@ table td{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
           <th class='w-80px'><?php echo $lang->issue->owner;?></th>
           <th class='w-150px'><?php echo $lang->issue->desc;?></th>
         </tr>
-      </thead> 
-      <tbody> 
+      </thead>
+      <tbody>
         <?php foreach($issues as $issue):?>
         <tr>
          <td><?php echo $issue->id;?></td>
@@ -40,7 +40,7 @@ table td{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
          <td><?php echo $issue->desc;?></td>
         </tr>
         <?php endforeach;?>
-      </tbody> 
+      </tbody>
     </table>
     <?php else:?>
     <div class='table-empty-tip'><?php echo $lang->noData;?></div>
diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php
index a3758a2b75..90183db74c 100644
--- a/module/story/view/report.html.php
+++ b/module/story/view/report.html.php
@@ -14,7 +14,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $browseLink = $this->session->storyList ? $this->session->storyList : $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=$browseType&moduleID=$moduleID&storyType=$storyType")?>
-    <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'> </i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'> </i> " . $lang->goback, '', "class='btn btn-link'");?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='text'><?php echo $lang->story->report->common;?></span>
@@ -46,7 +46,7 @@
       <div class='btn-toolbar'>
         <?php unset($lang->report->typeList['default']);?>
         <?php foreach($lang->report->typeList as $type => $typeName):?>
-        <?php echo html::a("javascript:changeChartType(\"$type\")", "<i class='icon icon-chart-{$type} muted'> </i>" . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
+        <?php echo html::a("javascript:changeChartType(\"$type\")", "<i class='icon icon-chart-{$type} muted'> </i> " . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
       </div>
       <div class='text-muted' style='padding-top:5px'><?php echo str_replace('%tab%', $lang->product->unclosed . $lang->story->common, $lang->report->notice->help);?></div>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 4e69d6c615..6822c29716 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -57,7 +57,7 @@
         $openGroup  = 'project';
     }
     ?>
-    <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam&bugID=0&planID=0&todoID=0&extra=&type=$story->type", "<i class='icon icon-plus'></i>" . $lang->story->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
+    <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam&bugID=0&planID=0&todoID=0&extra=&type=$story->type", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 129f5c3d94..5ab2bb92a6 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -68,7 +68,7 @@
             if(empty($suiteList))
             {
                 echo '<li>';
-                echo html::a($this->createLink('testsuite', 'create', "productID=$productID"), "<i class='icon-plus'></i>" . $lang->testsuite->create);
+                echo html::a($this->createLink('testsuite', 'create', "productID=$productID"), "<i class='icon-plus'></i> " . $lang->testsuite->create);
                 echo '</li>';
             }
         }
@@ -195,7 +195,7 @@
         <li <?php echo $disabled?>>
         <?php
         $batchLink = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
-        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->testcase->batchCreate, '', "data-app='{$this->app->openApp}'") . "</li>";
+        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->testcase->batchCreate, '', "data-app='{$this->app->openApp}'") . "</li>";
         ?>
         </li>
       </ul>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 35a40d8326..1c8df7a903 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -50,7 +50,7 @@
   <?php if(!isonlybody()):?>
   <div class='btn-toolbar pull-right'>
     <button type='button' class='btn btn-secondary fullscreen-btn' title='<?php echo $lang->retrack;?>'><i class='icon icon-fullscreen'></i><?php echo ' ' . $lang->retrack;?></button>
-    <?php if(common::canBeChanged('testcase', $case)) common::printLink('testcase', 'create', "productID={$case->product}&branch={$case->branch}&moduleID={$case->module}", "<i class='icon icon-plus'></i>" . $lang->testcase->create, '', "class='btn btn-primary'"); ?>
+    <?php if(common::canBeChanged('testcase', $case)) common::printLink('testcase', 'create', "productID={$case->product}&branch={$case->branch}&moduleID={$case->module}", "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary'"); ?>
   </div>
   <?php endif;?>
 </div>
diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php
index aa0d3d4905..b141a1fbcd 100644
--- a/module/testreport/view/browse.html.php
+++ b/module/testreport/view/browse.html.php
@@ -20,7 +20,7 @@
     </span>
   </div>
   <div class='pull-right btn-toolbar'>
-    <?php if($objectType == 'product' and $canBeChanged) common::printLink('testreport', 'create', "objectID=0&objectType=testtask&productID=$objectID", "<i class='icon icon-plus'></i>" . $lang->testreport->create, '', "class='btn btn-primary'");?>
+    <?php if($objectType == 'product' and $canBeChanged) common::printLink('testreport', 'create', "objectID=0&objectType=testtask&productID=$objectID", "<i class='icon icon-plus'></i> " . $lang->testreport->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <?php endif;?>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index d235b2721f..73d0c9bf75 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -18,7 +18,7 @@
   <div class='center-block'>
     <div class='main-header'>
       <h2><?php echo $lang->testreport->edit;?></h2>
-      <div class='btn-toolbar pull-right'><?php echo html::backButton('<i class="icon icon-back icon-sm"></i>' . $lang->goback, '', 'btn btn-link');?></div>
+      <div class='btn-toolbar pull-right'><?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-link');?></div>
     </div>
     <form method='post' enctype='multipart/form-data' target='hiddenwin'>
       <div class='detail'>
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php
index adbfcdaf47..f5f58f1a6e 100644
--- a/module/testreport/view/view.html.php
+++ b/module/testreport/view/view.html.php
@@ -17,7 +17,7 @@
   <div class='btn-toolbar pull-left'>
     <?php $browseLink = $this->session->reportList ? $app->session->reportList : $browseLink;?>
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-primary'");?>
+    <?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-primary'");?>
     <div class='divider'></div>
     <?php endif;?>
     <div class='page-title'>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index d66e5dbd8e..6a17896fb8 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -27,7 +27,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
 <!--div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
-    <?php echo html::a($backLink, '<i class="icon icon-back icon-sm"></i>' . $lang->goback, '', 'class="btn btn-secondary"');?>
+    <?php echo html::a($backLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'class="btn btn-secondary"');?>
     <div class="divider"></div>
     <div class="page-title">
       <?php $rootName = $viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost' ? '' : $root->name;?>
diff --git a/module/webhook/view/log.html.php b/module/webhook/view/log.html.php
index d7cbbe5e0b..6a7e62e751 100644
--- a/module/webhook/view/log.html.php
+++ b/module/webhook/view/log.html.php
@@ -5,7 +5,7 @@
  * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Gang Liu <liugang@cnezsoft.com>
- * @package     log 
+ * @package     log
  * @version     $Id$
  * @link        http://www.zentao.net
  */
@@ -21,7 +21,7 @@
     <div class='btn-toolbar pull-right'>
       <div class='btn-group'>
         <div class='btn-group' id='createActionMenu'>
-          <?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary iframe'", '', true);?>
+          <?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i> " . $lang->webhook->setting, '', "class='btn btn-primary iframe'", '', true);?>
         </div>
       </div>
     </div>