diff --git a/templates/repo/issue/milestone_edit_old.tmpl b/templates/repo/issue/milestone_edit_old.tmpl
deleted file mode 100644
index dee36152e5..0000000000
--- a/templates/repo/issue/milestone_edit_old.tmpl
+++ /dev/null
@@ -1,61 +0,0 @@
-{{template "base/head_old" .}}
-{{template "base/navbar" .}}
-{{template "repo/nav" .}}
-{{template "repo/toolbar" .}}
-<div id="body" class="container">
-    <div id="issue">
-        <form class="form" action="{{.RepoLink}}/milestones/{{.Milestone.Index}}/edit" method="post" id="issue-create-form">
-            {{.CsrfTokenHtml}}
-            {{template "base/alert" .}}
-            <div class="col-md-1">
-                <img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/>
-            </div>
-            <div class="col-md-8 panel panel-default">
-                <div class="form-group panel-body">
-                    <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.Milestone.Name}}" />
-                </div>
-                <div class="form-group panel-body">
-                    <div class="md-help pull-right"><!-- todo help link -->
-                        Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a>
-                    </div>
-                    <ul class="nav nav-tabs" data-init="tabs">
-                        <li class="active issue-write"><a href="#issue-textarea" data-toggle="tab">Write</a></li>
-                        <li class="issue-preview"><a href="#issue-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-preview">Preview</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane" id="issue-textarea">
-                            <div class="form-group">
-                                <textarea class="form-control" name="content" id="issue-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-preview" data-ajax-val="val" data-ajax-field="text">{{.Milestone.Content}}</textarea>
-                            </div>
-                        </div>
-                        <div class="tab-pane issue-preview-content" id="issue-preview">loading...</div>
-                    </div>
-                </div>
-                <div class="text-right panel-body">
-                    <div class="form-group">
-                        <input type="hidden" value="id" name="repo-id"/>
-                        <button class="btn-success btn">Update milestone</button>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <h4>Milestone Due Date</h4>
-                <div class="form-group">
-                    <input name="due_date" type="text" class="form-control" id="milestone-due-date" value="{{.Milestone.DeadlineString}}">
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
-<script src="/js/bootstrap-datepicker.js"></script>
-<script>
-    $(function(){
-        $('#milestone-due-date').datepicker({
-            weekStart: 1,
-            todayBtn: "linked",
-            calendarWeeks: true,
-            todayHighlight: true
-        });
-    });
-</script>
-{{template "base/footer_old" .}}
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 108afb0cb6..8fd4d1bb2c 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
@@ -4,6 +4,11 @@
 	<div class="ui middle page grid body">
 		<div class="navbar">
 			{{template "repo/issue/navbar" .}}
+			{{if and .IsRepositoryAdmin .PageIsEditMilestone}}
+			<div class="ui right floated secondary menu">
+				<a class="ui green button" href="{{$.RepoLink}}/milestones/new">{{.i18n.Tr "repo.milestones.new"}}</a>
+			</div>
+			{{end}}
 		</div>
 		<div class="ui divider"></div>
 		<div class="sixteen wide column page grid">