diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index 791654427a..50fbb4baf6 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -28,7 +28,7 @@ $useGuest = $this->app->user->account == 'guest';
         <div class='panel-heading'>
           <div class='panel-actions'>
             <?php if(!empty($block->moreLink)):?>
-               <?php echo html::a($block->moreLink, $lang->more . " <i class='icon-double-angle-right'></i>", null, "class='panel-action drag-disabled panel-action-more'"); ?>
+               <?php echo html::a($block->moreLink, " <i class='icon icon-more'></i>", null, "class='panel-action drag-disabled panel-action-more'"); ?>
             <?php endif; ?>
             <div class='dropdown'>
               <a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index aeb47a02c3..13ac5d7571 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -256,7 +256,7 @@ if($shortcut.size() > 0)
 <?php endif;?>
 <?php $this->app->loadConfig('qa', '', false);?>
 <?php if(isset($this->config->qa->homepage) and $this->config->qa->homepage != 'browse'):?>
-$(function(){$('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"browse\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")});
+$(function(){$('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"browse\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")});
 <?php endif;?>
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 4870a8f197..1622cf20e2 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -299,7 +299,7 @@ if($shortcut.size() > 0)
 }
 <?php endif;?>
 <?php if(isset($this->config->product->homepage) and $this->config->product->homepage != 'browse'):?>
-$('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"product\", \"browse\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
+$('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"product\", \"browse\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")
 <?php endif;?>
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/browsedata.html.php b/module/product/view/browsedata.html.php
index ae403166fb..be0a1ade4d 100644
--- a/module/product/view/browsedata.html.php
+++ b/module/product/view/browsedata.html.php
@@ -90,7 +90,7 @@
           <?php 
           $vars = "story={$story->id}";
           common::printIcon('story', 'change',     $vars, $story, 'list', 'random');
-          common::printIcon('story', 'review',     $vars, $story, 'list', 'search');
+          common::printIcon('story', 'review',     $vars, $story, 'list', 'review');
           common::printIcon('story', 'close',      $vars, $story, 'list', 'off', '', 'iframe', true);
           common::printIcon('story', 'edit',       $vars, $story, 'list', 'pencil');
           common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php
index abe9625404..7fdddff15a 100644
--- a/module/product/view/index.html.php
+++ b/module/product/view/index.html.php
@@ -16,7 +16,7 @@
 <?php if($this->config->product->homepage != 'index'):?>
 $(function()
 {
-    $('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"product\", \"index\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
+    $('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"product\", \"index\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")
 });
 <?php endif;?>
 </script>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index d761560f96..89f572fd1f 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -15,7 +15,7 @@
 <?php if($this->config->project->homepage != 'index'):?>
 $(function()
 {
-    $('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"project\", \"index\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
+    $('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"project\", \"index\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")
 });
 <?php endif;?>
 </script>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 6af33e33f7..cfa0b91ccc 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -110,15 +110,15 @@
             if(commonModel::isTutorialMode())
             {
                 $wizardParams = helper::safe64Encode($param);
-                echo html::a($this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-list-ul'></i>",'', "class='btn-icon btn-task-create' title='{$lang->project->wbs}'");
+                echo html::a($this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-plus-border'></i>",'', "class='btn-icon btn-task-create' title='{$lang->project->wbs}'");
             }
             else
             {
-                common::printIcon('task', 'create', $param, '', 'list', 'list-ul', '', 'btn-task-create');
+                common::printIcon('task', 'create', $param, '', 'list', 'plus-border', '', 'btn-task-create');
             }
 
             $lang->task->batchCreate = $lang->project->batchWBS;
-            common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack');
+            common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'plus-sign');
 
             $lang->testcase->batchCreate = $lang->testcase->create;
             if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap');
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 5ed4e1bed6..ce3d60a80d 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -141,7 +141,7 @@ if($shortcut.size() > 0)
 statusActive = '<?php echo isset($lang->project->statusSelects[$this->session->taskBrowseType]);?>';
 if(statusActive) $('#statusTab').addClass('active')
 <?php if(isset($this->config->project->homepage) and $this->config->project->homepage != 'browse'):?>
-$('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"project\", \"browse\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
+$('#modulemenu .nav li.right:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"project\", \"browse\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")
 <?php endif;?>
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/qa/view/index.html.php b/module/qa/view/index.html.php
index 37a2bcde94..a2df173052 100644
--- a/module/qa/view/index.html.php
+++ b/module/qa/view/index.html.php
@@ -16,7 +16,7 @@
 <?php if($this->config->qa->homepage != 'index'):?>
 $(function()
 {
-    $('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"index\")'><i class='icon icon-cog'></i><?php echo $lang->homepage?></a></li>")
+    $('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"index\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")
 });
 <?php endif;?>
 </script>
diff --git a/module/story/model.php b/module/story/model.php
index 801050730d..08eace919f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2287,7 +2287,7 @@ class storyModel extends model
             case 'actions':
                 $vars = "story={$story->id}";
                 common::printIcon('story', 'change',     $vars, $story, 'list', 'random');
-                common::printIcon('story', 'review',     $vars, $story, 'list', 'search');
+                common::printIcon('story', 'review',     $vars, $story, 'list', 'review');
                 common::printIcon('story', 'close',      $vars, $story, 'list', 'off', '', 'iframe', true);
                 common::printIcon('story', 'edit',       $vars, $story, 'list', 'pencil');
                 common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index ce31b59d2d..ad8196582e 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -57,8 +57,7 @@
         $this->app->loadLang('testcase');
         echo "<div class='btn-group'>";
         echo "<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>";
-        echo "<i class='icon icon-plus'></i>" . $lang->testcase->common;
-        echo "<span class='caret'></span>";
+        echo "<i class='icon icon-plus'></i>" . $lang->testcase->common . " <span class='caret'></span>";
         echo "</button>";
         echo "<ul class='dropdown-menu' id='createCaseActionMenu'>";
         $misc = common::hasPriv('testcase', 'create') ? "data-toggle='modal' data-type='iframe' data-width='95%'" : "class='disabled'";
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 5698c152f9..6065649921 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -603,7 +603,7 @@ body {color:#141414; padding-bottom: 40px;}
 .outer .main ul.list-unstyled li {padding: 2px 0}
 
 .outer .main .table tr > th:first-child, .outer .main .table tr > td:first-child {padding-left: 0;}
-.outer .main-side > fieldset {padding: 5px 0px 10px 10px;}
+.outer .main-side > fieldset {padding: 5px 20px 10px 10px;}
 .outer .main-side > fieldset > .table {border: none}
 
 .outer .main .tabs {margin-bottom: 15px;}