diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index d58a61756..c95aec81e 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1127,6 +1127,7 @@ issues.filter_label_exclude = `Use <code>alt</code> + <code>click/enter</code> t
 issues.filter_label_no_select = All labels
 issues.filter_milestone = Milestone
 issues.filter_milestone_no_select = All milestones
+issues.filter_milestone_no_add =  Not add milestones 
 issues.filter_assignee = Assignee
 issues.filter_assginee_no_select = All assignees
 issues.filter_type = Type
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 45cabda8f..edeb1356e 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1140,6 +1140,7 @@ issues.filter_label_exclude=`使用 <code>alt</code> + <code>鼠标左键 / 回
 issues.filter_label_no_select=所有标签
 issues.filter_milestone=里程碑筛选
 issues.filter_milestone_no_select=所有里程碑
+issues.filter_milestone_no_add=未添加里程碑
 issues.filter_assignee=指派人筛选
 issues.filter_assginee_no_select=所有指派成员
 issues.filter_type=类型筛选
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index a4d1e30bf..96d4c0ab5 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -1,13 +1,9 @@
 <style>
-	li{
-		list-style-type:none;
+	.repository .filter.menu.labels .svg{
+		margin-right: 2px !important;
 	}
-	.leftcontent{
-		width:30px;
-		float: left;
-	}
-	.rightcontent{
-		margin-left: 30px;
+	.ovfl{
+		overflow-y:hidden !important;
 	}
 </style>
 {{template "base/head" .}}
@@ -69,22 +65,41 @@
 					</div>
 
 					<!-- Milestone -->
-					<div class="ui {{if not .Milestones}}disabled{{end}} dropdown jump item">
+					<div class="ui {{if and (not .OpenMilestones) (not .ClosedMilestones)}}disabled{{end}} dropdown jump item">
 						<span class="text">
 							{{.i18n.Tr "repo.issues.filter_milestone"}}
 							<i class="dropdown icon"></i>
 						</span>
 						<div class="menu">
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_milestone_no_select"}}</a>
-							{{range .Milestones}}
-								<!-- <a class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}"><span>{{if eq $.MilestoneID .ID}}<img  style=" width:15px; height:15px;float: left;;vertical-align: middle" src="/img/pro.svg">{{end}}</span><span style="float: right;">{{.Name}}</span></a> -->
+							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone=-1&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_milestone_no_add"}}</a>
+						
+											
+							{{if .OpenMilestones}}
+								<div class="divider" ></div>
+								<div class="header ovfl"  >
+									{{svg "octicon-milestone" 12 }}
+									{{.i18n.Tr "repo.issues.new.open_milestone"}}
+								</div>
+								{{range .OpenMilestones}}
+									<a  class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">
+										{{.Name}}
+									</a>
+								{{end}}
+						  	{{end}}
+
+							{{if .ClosedMilestones}}
+							    <div class="divider"></div>
+							    <div class="header ovfl" >
+									{{svg "octicon-milestone" 12}}
+									{{.i18n.Tr "repo.issues.new.closed_milestone"}}
+							     </div>
+							    {{range .ClosedMilestones}}
 								<a  class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">
-									
-										<li class="leftcontent">{{if eq $.MilestoneID .ID}}<img  style=" width:15px; height:15px;float: left;;vertical-align: middle" src="/img/correct.svg" >{{end}}</li>
-										<li class="rightcontent">{{.Name}}</li>							
+									{{.Name}}
 								</a>
-								<!-- <a class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">{{.Name}}</a> -->
-							{{end}}
+								{{end}}
+							{{end}}							
 						</div>
 					</div>