diff --git a/README.md b/README.md
index 623f22fc07c..c8043868d3c 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current tip version: 0.9.40 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.41 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
diff --git a/gogs.go b/gogs.go
index 201fc732428..37d66f1a360 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.40.0709"
+const APP_VER = "0.9.41.0711"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/public/config.codekit b/public/config.codekit
index 0aeffc3356e..a0a1792e586 100644
--- a/public/config.codekit
+++ b/public/config.codekit
@@ -1,6 +1,6 @@
 {
 "CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit",
-"creatorBuild": "19102",
+"creatorBuild": "19115",
 "files": {
 	"\/css\/github.min.css": {
 		"fileType": 16,
diff --git a/templates/.VERSION b/templates/.VERSION
index 52f9aa2d41d..41b0852e4b8 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.9.40.0709
\ No newline at end of file
+0.9.41.0711
\ No newline at end of file
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index c289dbcb7a6..2260f17399d 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -16,11 +16,11 @@
 		{{if .Issue.IsPull}}
 			{{template "repo/issue/view_title" .}}
 			{{template "repo/pulls/tab_menu" .}}
-			<div class="ui bottom attached tab pull segment active has-emoji" data-tab="request-{{.ID}}">
+			<div class="ui bottom attached tab pull segment active" data-tab="request-{{.ID}}">
 				{{template "repo/issue/view_content" .}}
 			</div>
 		{{else}}
-			<div class="has-emoji">
+			<div>
 				{{template "repo/issue/view_content" .}}
 			</div>
 		{{end}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index e5c3d3d42d4..67560d20f49 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -25,7 +25,7 @@
 						</div>
 					</div>
 					<div class="ui attached segment">
-						<div class="render-content markdown emojify">
+						<div class="render-content markdown has-emoji">
 							{{if .Issue.RenderedContent}}
 								{{.Issue.RenderedContent|Str2html}}
 							{{else}}
@@ -77,7 +77,7 @@
 								</div>
 							</div>
 							<div class="ui attached segment">
-								<div class="render-content markdown emojify">
+								<div class="render-content markdown has-emoji">
 									{{if .RenderedContent}}
 										{{.RenderedContent|Str2html}}
 									{{else}}
@@ -342,7 +342,7 @@
 		<div class="ui bottom attached active write tab segment">
 			<textarea tabindex="1" id="content" name="content"></textarea>
 		</div>
-		<div class="ui bottom attached tab preview segment markdown emojify">
+		<div class="ui bottom attached tab preview segment markdown">
 			{{$.i18n.Tr "repo.release.loading"}}
 		</div>
 		<div class="text right edit buttons">