diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 997b00bb5..6bf6fbafa 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -532,6 +532,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			if len(ctx.Repo.TreePath) > 0 {
 				ogImg += "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
 			}
+
 			ctx.Data["OgImage"] = ogImg
 			ctx.Data["EscapeStatus"] = status
 			ctx.Data["FileContent"] = fileContent
@@ -1055,11 +1056,6 @@ func renderCode(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplRepoHome)
 }
 
-func HighlightCodeToImage() error {
-
-	return nil
-}
-
 // RenderUserCards render a page show users according the input template
 func RenderUserCards(ctx *context.Context, total int, getter func(opts db.ListOptions) ([]*user_model.User, error), tpl base.TplName) {
 	page := ctx.FormInt("page")
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 1c5f2db44..46749da52 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -33,19 +33,25 @@
 	{{if .ContextUser.Description}}
 		<meta property="og:description" content="{{.ContextUser.Description}}">
 	{{end}}
-{{else if .PageIsViewCode }}
-  <meta name="twitter:image:src" content="{{.OgImage}}">
+{{else if and .PageIsViewCode .HideRepoInfo }}
 	<meta name="twitter:site" content="@gitea">
-	<meta name="twitter:card" content="summary_large_image">
-	<meta name="twitter:title" content="{{.Repository.Name}}/{{.FileName}}">
 	<meta name="twitter:description" content="{{.Repository.Description}}">
-	<meta property="og:image" content="{{.OgImage}}">
-	<meta property="og:image:alt" content="{{.Repository.Description}}">
+	<meta name="twitter:title" content="{{.Repository.Name}}/{{.FileName}}">
 	<meta property="og:site_name" content="{{AppName}}">
 	<meta property="og:type" content="object">
 	<meta property="og:title" content="{{.Repository.Name}}/{{.FileName}}">
 	<meta property="og:url" content="{{.Repository.HTMLURL}}">
-	<meta property="og:description" content="{{.Repository.Description}}">
+	{{ if .OgImage }}
+		<meta property="og:description" content="{{.Repository.Description}}">
+		<meta name="twitter:card" content="summary_large_image">
+		<meta name="twitter:image:src" content="{{.OgImage}}">
+		<meta property="og:image" content="{{.OgImage}}">
+		<meta property="og:image:alt" content="{{.Repository.Description}}">
+	{{ else if (.Repository.AvatarLink $.Context)}}
+		<meta property="og:image" content="{{.Repository.AvatarLink $.Context}}">
+	{{else}}
+		<meta property="og:image" content="{{.Repository.Owner.AvatarLink $.Context}}">
+	{{ end }}
 {{else if .Repository}}
 	{{if .Issue}}
 		<meta property="og:title" content="{{.Issue.Title}}">
@@ -54,7 +60,7 @@
 			<meta property="og:description" content="{{.Issue.Content}}">
 		{{end}}
 	{{else}}
-		<meta property="og:title" content="{{.Repository.Name}}">
+		<meta property="og:title" content="{{.Repository.Owner.Name}}/{{.Repository.Name}}">
 		<meta property="og:url" content="{{.Repository.HTMLURL}}">
 		{{if .Repository.Description}}
 			<meta property="og:description" content="{{.Repository.Description}}">