diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 28610db881..c0d3840a96 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -80,7 +80,7 @@ td.c-name a:visited {color: #082999;}
 
 #pageNav .dropdown-menu {max-height: 350px; overflow-y: auto;}
 
-#createDropdown ul.dropdown-menu {width: 100%;}
+#createDropdown ul.dropdown-menu {text-align: left;}
 #project, #product, #custom, #book {min-height: 160px;}
 #title .menu-title {font-size: 15px; font-weight: 600; position: relative; padding: 2px 0 2px 15px; list-style: none;}
 #title .dropdown-menu {top: 38px;}
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 48e0412c9e..034d90d78a 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -131,6 +131,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 48b7e2db6c..4e800e0c96 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -136,6 +136,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index f1a2151826..4c56b8e7c5 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -131,6 +131,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 
diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php
index 54e8f30b41..db2dd8f74c 100644
--- a/module/doc/lang/vi.php
+++ b/module/doc/lang/vi.php
@@ -131,6 +131,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = 'Text';
 $lang->doc->types['url']  = 'URL';
 
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index be111d38e5..14231d8ed0 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -136,6 +136,13 @@ $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
 
+$lang->doc->iconList['html']     = 'rich-text';
+$lang->doc->iconList['markdown'] = 'markdown';
+$lang->doc->iconList['url']      = 'text-link';
+$lang->doc->iconList['word']     = 'word';
+$lang->doc->iconList['ppt']      = 'ppt';
+$lang->doc->iconList['excel']    = 'excel';
+
 $lang->doc->types['text'] = '文档';
 $lang->doc->types['url']  = '链接';
 
diff --git a/module/doc/model.php b/module/doc/model.php
index eaffc5bfc0..53c1e1a355 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1707,15 +1707,17 @@ class docModel extends model
         {
             $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 .= "<ul class='dropdown-menu' style='left:0px'>";
+            $html .= "<ul class='dropdown-menu pull-right'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
                 $class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
+                $icon  = zget($this->lang->doc->iconList, $typeKey);
                 $html .= "<li>";
-                $html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
+                $html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon'></i> '" . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
                 $html .= "</li>";
-
+                if($typeKey == 'url') $html .= '<li class="divider"></li>';
             }
+
             if(common::hasPriv('doc', 'createLib'))
             {
                 $html .= '<li class="divider"></li>';
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index d30554a484..70066efe67 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -87,11 +87,12 @@ if(empty($type)) $type = 'product';
             $html .= "<ul class='dropdown-menu' style='left:0px'>";
             foreach($this->lang->doc->typeList as $typeKey => $typeName)
             {
+                $icon  = zget($this->lang->doc->iconList, $typeKey);
                 $class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
                 $html .= "<li>";
-                $html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
+                $html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon'></i> '" . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
                 $html .= "</li>";
-
+                if($typeKey == 'url') $html .= '<li class="divider"></li>';
             }
             $html .= "</ul></div>";
         }
diff --git a/www/theme/default/images/main/new_theme.png b/www/theme/default/images/main/new_theme.png
index 1b99aa310f..11c6434b15 100644
Binary files a/www/theme/default/images/main/new_theme.png and b/www/theme/default/images/main/new_theme.png differ