diff --git a/app/actions/tenant.go b/app/actions/tenant.go
index 9ecb47c03..c702f1a72 100644
--- a/app/actions/tenant.go
+++ b/app/actions/tenant.go
@@ -194,6 +194,7 @@ type UpdateTenantSettings struct {
 	Title          string           `json:"title"`
 	Invitation     string           `json:"invitation"`
 	WelcomeMessage string           `json:"welcomeMessage"`
+	WelcomeHeader  string           `json:"welcomeHeader"`
 	Locale         string           `json:"locale"`
 	CNAME          string           `json:"cname" format:"lower"`
 }
@@ -242,6 +243,10 @@ func (action *UpdateTenantSettings) Validate(ctx context.Context, user *entity.U
 		result.AddFieldFailure("invitation", "Invitation must have less than 60 characters.")
 	}
 
+	if len(action.WelcomeHeader) > 100 {
+		result.AddFieldFailure("welcomeHeader", "Welcome Header must have less than 100 characters.")
+	}
+
 	if !i18n.IsValidLocale(action.Locale) {
 		result.AddFieldFailure("locale", "Locale is invalid.")
 	}
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 17a4561b7..ec48fe800 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -56,6 +56,7 @@ func UpdateSettings() web.HandlerFunc {
 				Title:          action.Title,
 				Invitation:     action.Invitation,
 				WelcomeMessage: action.WelcomeMessage,
+				WelcomeHeader:  action.WelcomeHeader,
 				CNAME:          action.CNAME,
 				Locale:         action.Locale,
 			},
diff --git a/app/handlers/post.go b/app/handlers/post.go
index ced787e70..0cb663431 100644
--- a/app/handlers/post.go
+++ b/app/handlers/post.go
@@ -61,7 +61,8 @@ func Index() web.HandlerFunc {
 		return c.Page(http.StatusOK, web.Props{
 			Page:        "Home/Home.page",
 			Description: description,
-			Data:        data,
+			// Header:      c.Tenant().WelcomeHeader,
+			Data: data,
 		})
 	}
 }
diff --git a/app/models/cmd/tenant.go b/app/models/cmd/tenant.go
index 62b0006fc..a4dcbc9a9 100644
--- a/app/models/cmd/tenant.go
+++ b/app/models/cmd/tenant.go
@@ -30,6 +30,7 @@ type UpdateTenantSettings struct {
 	Title          string
 	Invitation     string
 	WelcomeMessage string
+	WelcomeHeader  string
 	CNAME          string
 	Locale         string
 }
diff --git a/app/models/entity/tenant.go b/app/models/entity/tenant.go
index 98c92e2a6..69165efc3 100644
--- a/app/models/entity/tenant.go
+++ b/app/models/entity/tenant.go
@@ -9,6 +9,7 @@ type Tenant struct {
 	Subdomain          string            `json:"subdomain"`
 	Invitation         string            `json:"invitation"`
 	WelcomeMessage     string            `json:"welcomeMessage"`
+	WelcomeHeader      string            `json:"welcomeHeader"`
 	CNAME              string            `json:"cname"`
 	Status             enum.TenantStatus `json:"status"`
 	Locale             string            `json:"locale"`
diff --git a/app/pkg/web/react_test.go b/app/pkg/web/react_test.go
index b6921cba8..4d60c7204 100644
--- a/app/pkg/web/react_test.go
+++ b/app/pkg/web/react_test.go
@@ -52,7 +52,8 @@ func TestReactRenderer_RenderEmptyHomeHTML(t *testing.T) {
 		},
 	})
 	Expect(html).ContainsSubstring(`<div class="c-dev-banner">DEV</div>`)
-	Expect(html).ContainsSubstring(`<button type="submit" class="c-button c-button--default c-button--secondary c-input">Enter your suggestion here...</button>`)
+	Expect(html).ContainsSubstring(`<button class="p-home__add-idea-btn">`)
+	Expect(html).ContainsSubstring(`Enter your suggestion here...`)
 	Expect(html).ContainsSubstring(`What can we do better? This is the place for you to vote, discuss and share ideas.`)
 	Expect(html).ContainsSubstring(`No posts have been created yet.`)
 	Expect(html).ContainsSubstring(`Powered by Fider`)
@@ -81,7 +82,8 @@ func TestReactRenderer_RenderEmptyHomeHTML_Portuguese(t *testing.T) {
 		},
 	})
 	Expect(html).ContainsSubstring(`<div class="c-dev-banner">DEV</div>`)
-	Expect(html).ContainsSubstring(`<button type="submit" class="c-button c-button--default c-button--secondary c-input">Insira sua sugestão aqui...</button`)
+	Expect(html).ContainsSubstring(`<button class="p-home__add-idea-btn">`)
+	Expect(html).ContainsSubstring(`Insira sua sugestão aqui...`)
 	Expect(html).ContainsSubstring(`O que podemos fazer melhor? Este é o lugar para você votar, discutir e compartilhar ideias.`)
 	Expect(html).ContainsSubstring(`Nenhuma postagem foi criada ainda.`)
 	Expect(html).ContainsSubstring(`Powered by Fider`)
diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.html
index 32c2823bf..8398825ae 100755
--- a/app/pkg/web/testdata/home_ssr.html
+++ b/app/pkg/web/testdata/home_ssr.html
@@ -45,7 +45,7 @@ <h2 class="text-display2">Please enable JavaScript</h2>
 
   <script id="server-data" type="application/json">
      
-  {"contextID":"CONTEXT_ID","description":"My Page Description","page":"Test.page","props":{"countPerStatus":{},"posts":[],"tags":[]},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":{"id":0,"name":"","subdomain":"","invitation":"","welcomeMessage":"","cname":"","status":0,"locale":"en","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false},"title":"My Page Title · "}
+  {"contextID":"CONTEXT_ID","description":"My Page Description","page":"Test.page","props":{"countPerStatus":{},"posts":[],"tags":[]},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":{"id":0,"name":"","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","cname":"","status":0,"locale":"en","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false},"title":"My Page Title · "}
 
   </script>
 
diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.html
index 3792b4999..e62973501 100755
--- a/app/pkg/web/testdata/tenant.html
+++ b/app/pkg/web/testdata/tenant.html
@@ -45,7 +45,7 @@ <h2 class="text-display2">Please enable JavaScript</h2>
 
   <script id="server-data" type="application/json">
      
-  {"contextID":"CONTEXT_ID","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","cname":"","status":0,"locale":"","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false},"title":"Game of Thrones"}
+  {"contextID":"CONTEXT_ID","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","cname":"","status":0,"locale":"","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false},"title":"Game of Thrones"}
 
   </script>
 
diff --git a/app/services/sqlstore/postgres/comment.go b/app/services/sqlstore/postgres/comment.go
index eaaa17d73..ba195065f 100644
--- a/app/services/sqlstore/postgres/comment.go
+++ b/app/services/sqlstore/postgres/comment.go
@@ -245,7 +245,7 @@ func getCommentsByPost(ctx context.Context, q *query.GetCommentsByPost) error {
 			WHERE p.id = $1
 			AND p.tenant_id = $2
 			AND c.deleted_at IS NULL
-			ORDER BY c.created_at ASC`, q.Post.ID, tenant.ID, userId)
+			ORDER BY c.created_at DESC`, q.Post.ID, tenant.ID, userId)
 		if err != nil {
 			return errors.Wrap(err, "failed get comments of post with id '%d'", q.Post.ID)
 		}
diff --git a/app/services/sqlstore/postgres/post_test.go b/app/services/sqlstore/postgres/post_test.go
index ba5d7db40..84febcb91 100644
--- a/app/services/sqlstore/postgres/post_test.go
+++ b/app/services/sqlstore/postgres/post_test.go
@@ -305,10 +305,10 @@ func TestPostStorage_AddAndReturnComments(t *testing.T) {
 	Expect(err).IsNil()
 	Expect(commentsByPost.Result).HasLen(2)
 
-	Expect(commentsByPost.Result[0].Content).Equals("Comment #1")
-	Expect(commentsByPost.Result[0].User.Name).Equals("Jon Snow")
-	Expect(commentsByPost.Result[1].Content).Equals("Comment #2")
-	Expect(commentsByPost.Result[1].User.Name).Equals("Arya Stark")
+	Expect(commentsByPost.Result[0].Content).Equals("Comment #2")
+	Expect(commentsByPost.Result[0].User.Name).Equals("Arya Stark")
+	Expect(commentsByPost.Result[1].Content).Equals("Comment #1")
+	Expect(commentsByPost.Result[1].User.Name).Equals("Jon Snow")
 }
 
 func TestPostStorage_AddGetUpdateComment(t *testing.T) {
diff --git a/app/services/sqlstore/postgres/tenant.go b/app/services/sqlstore/postgres/tenant.go
index 5473ad2c4..2c91c0817 100644
--- a/app/services/sqlstore/postgres/tenant.go
+++ b/app/services/sqlstore/postgres/tenant.go
@@ -23,6 +23,7 @@ type dbTenant struct {
 	CNAME              string `db:"cname"`
 	Invitation         string `db:"invitation"`
 	WelcomeMessage     string `db:"welcome_message"`
+	WelcomeHeader      string `db:"welcome_header"`
 	Status             int    `db:"status"`
 	Locale             string `db:"locale"`
 	IsPrivate          bool   `db:"is_private"`
@@ -46,6 +47,7 @@ func (t *dbTenant) toModel() *entity.Tenant {
 		CNAME:              t.CNAME,
 		Invitation:         t.Invitation,
 		WelcomeMessage:     t.WelcomeMessage,
+		WelcomeHeader:      t.WelcomeHeader,
 		Status:             enum.TenantStatus(t.Status),
 		Locale:             t.Locale,
 		IsPrivate:          t.IsPrivate,
@@ -153,8 +155,8 @@ func updateTenantSettings(ctx context.Context, c *cmd.UpdateTenantSettings) erro
 			c.Logo.BlobKey = ""
 		}
 
-		query := "UPDATE tenants SET name = $1, invitation = $2, welcome_message = $3, cname = $4, logo_bkey = $5, locale = $6 WHERE id = $7"
-		_, err := trx.Execute(query, c.Title, c.Invitation, c.WelcomeMessage, c.CNAME, c.Logo.BlobKey, c.Locale, tenant.ID)
+		query := "UPDATE tenants SET name = $1, invitation = $2, welcome_message = $3, welcome_header = $4, cname = $5, logo_bkey = $6, locale = $7 WHERE id = $8"
+		_, err := trx.Execute(query, c.Title, c.Invitation, c.WelcomeMessage, c.WelcomeHeader, c.CNAME, c.Logo.BlobKey, c.Locale, tenant.ID)
 		if err != nil {
 			return errors.Wrap(err, "failed update tenant settings")
 		}
@@ -163,6 +165,7 @@ func updateTenantSettings(ctx context.Context, c *cmd.UpdateTenantSettings) erro
 		tenant.Invitation = c.Invitation
 		tenant.CNAME = c.CNAME
 		tenant.WelcomeMessage = c.WelcomeMessage
+		tenant.WelcomeHeader = c.WelcomeHeader
 
 		return nil
 	})
@@ -290,7 +293,7 @@ func getFirstTenant(ctx context.Context, q *query.GetFirstTenant) error {
 		tenant := dbTenant{}
 
 		err := trx.Get(&tenant, `
-			SELECT id, name, subdomain, cname, invitation, locale, welcome_message, status, is_private, logo_bkey, custom_css, allowed_schemes, is_email_auth_allowed, is_feed_enabled, prevent_indexing
+			SELECT id, name, subdomain, cname, invitation, locale, welcome_message, welcome_header, status, is_private, logo_bkey, custom_css, allowed_schemes, is_email_auth_allowed, is_feed_enabled, prevent_indexing
 			FROM tenants
 			ORDER BY id LIMIT 1
 		`)
@@ -309,7 +312,7 @@ func getTenantByDomain(ctx context.Context, q *query.GetTenantByDomain) error {
 		tenant := dbTenant{}
 
 		err := trx.Get(&tenant, `
-			SELECT id, name, subdomain, cname, invitation, locale, welcome_message, status, is_private, logo_bkey, custom_css, allowed_schemes, is_email_auth_allowed, is_feed_enabled, prevent_indexing
+			SELECT id, name, subdomain, cname, invitation, locale, welcome_message, welcome_header, status, is_private, logo_bkey, custom_css, allowed_schemes, is_email_auth_allowed, is_feed_enabled, prevent_indexing
 			FROM tenants t
 			WHERE subdomain = $1 OR subdomain = $2 OR cname = $3
 			ORDER BY cname DESC
diff --git a/e2e/step_definitions/home.steps.ts b/e2e/step_definitions/home.steps.ts
index ac5f6dead..2ee4455bc 100644
--- a/e2e/step_definitions/home.steps.ts
+++ b/e2e/step_definitions/home.steps.ts
@@ -13,7 +13,7 @@ Then("I should be on the home page", async function (this: FiderWorld) {
 })
 
 Then("I click on the first post", async function (this: FiderWorld) {
-  await this.page.click(".c-posts-container__post:first-child a")
+  await this.page.click(".c-posts-container__post-link:first-of-type")
 })
 
 Then("I search for {string}", async function (this: FiderWorld, searchTerm: string) {
@@ -32,7 +32,7 @@ Given("I type {string} as the description", async function (this: FiderWorld, de
 })
 
 Given("I click enter your suggestion", async function () {
-  await this.page.click(".p-home__welcome-col .c-button--default")
+  await this.page.click(".p-home__add-idea-btn")
 })
 
 Given("I type my email address", async function (this: FiderWorld) {
diff --git a/e2e/step_definitions/show_post.steps.ts b/e2e/step_definitions/show_post.steps.ts
index 78d2b0937..73b28f35a 100644
--- a/e2e/step_definitions/show_post.steps.ts
+++ b/e2e/step_definitions/show_post.steps.ts
@@ -13,5 +13,6 @@ Then("I should see {string} as the post title", async function (this: FiderWorld
 })
 
 Then("I should see {int} vote\\(s)", async function (this: FiderWorld, voteCount: number) {
-  await expect(this.page.getByText(`${voteCount}${voteCount === 1 ? "Vote" : "Votes"}`, { exact: true })).toBeVisible()
+  // Look for the vote count number with the specific styling
+  await expect(this.page.locator(".text-2xl").filter({ hasText: voteCount.toString() })).toBeVisible()
 })
diff --git a/e2e/step_definitions/user.steps.ts b/e2e/step_definitions/user.steps.ts
index 83469fce2..ec39ad935 100644
--- a/e2e/step_definitions/user.steps.ts
+++ b/e2e/step_definitions/user.steps.ts
@@ -13,7 +13,7 @@ Given("I sign in as {string}", async function (this: FiderWorld, userName: strin
   }
 
   const userEmail = `${userName}-${this.tenantName}@fider.io`
-  await this.page.click(".c-menu .uppercase.text-sm")
+  await this.page.getByRole("button", { name: "Sign in" }).click()
   await this.page.fill(".c-signin-control #input-email", userEmail)
   await this.page.click(".c-signin-control .c-button--primary")
 
diff --git a/locale/ar/client.json b/locale/ar/client.json
index 2af94104b..04cb6fb03 100644
--- a/locale/ar/client.json
+++ b/locale/ar/client.json
@@ -10,6 +10,7 @@
   "action.edit": "تعديل",
   "action.markallasread": "تمييز الكل كمقروءة",
   "action.ok": "حسناً",
+  "action.postcomment": "",
   "action.postsfeed": "تغذية المنشورات",
   "action.respond": "رد",
   "action.save": "احفظ",
@@ -91,7 +92,9 @@
   "label.unfollow": "إلغاء المتابعة",
   "label.unread": "غير مقروء",
   "label.unsubscribe": "إلغاء الاشتراك",
+  "label.vote": "",
   "label.voters": "المصوتون",
+  "label.votes": "",
   "labels.notagsavailable": "لا توجد وسوم متاحة",
   "labels.notagsselected": "لم يتم تحديد أي علامات",
   "legal.agreement": "لقد قرأت <0/> و<1/> وأوافق على ذلك.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# صوت} other {# أصوات}}",
   "showpost.notificationspanel.message.subscribed": "أنت تتلقى إشعارات عن النشاط على هذا المنشور.",
   "showpost.notificationspanel.message.unsubscribed": "لن تتلقى أي إشعار بشأن هذا المنشور.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} أصوات",
   "showpost.postsearch.query.placeholder": "البحث في المنشور الأصلي...",
   "showpost.response.date": "تغيرت الحالة إلى {status} على {statusDate}",
   "showpost.responseform.message.mergedvotes": "سيتم دمج التصويتات من هذا المنشور في المنشور الأصلية.",
   "showpost.responseform.text.placeholder": "ما الذي يجري مع هذا المنشور؟ أخبر المستخدمين ما هي خططك...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} أكثر",
   "showpost.votespanel.seedetails": "عرض التفاصيل",
   "signin.code.edit": "يحرر",
+  "signin.code.expired": "انتهت صلاحية هذا الرمز أو تم استخدامه مسبقًا. يُرجى طلب رمز جديد.",
   "signin.code.getnew": "احصل على رمز جديد",
   "signin.code.instruction": "الرجاء كتابة الرمز الذي أرسلناه للتو إلى <0>{email}</0>",
+  "signin.code.invalid": "الرمز الذي أدخلته غير صحيح. يُرجى المحاولة مرة أخرى.",
   "signin.code.placeholder": "اكتب الكود هنا",
   "signin.code.sent": "لقد تم إرسال رمز جديد إلى بريدك الإلكتروني.",
   "signin.code.submit": "يُقدِّم",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "اسمك",
   "validation.custom.maxattachments": "يُسمح بحد أقصى {number} من المرفقات.",
   "validation.custom.maximagesize": "يجب أن يكون حجم الصورة أصغر من {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, zero {}one {# وسم} two {# وسوم} few {# وسوم} many {# وسوم} other {# وسوم}}",
-  "signin.code.expired": "انتهت صلاحية هذا الرمز أو تم استخدامه مسبقًا. يُرجى طلب رمز جديد.",
-  "signin.code.invalid": "الرمز الذي أدخلته غير صحيح. يُرجى المحاولة مرة أخرى."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, zero {}one {# وسم} two {# وسوم} few {# وسوم} many {# وسوم} other {# وسوم}}"
 }
\ No newline at end of file
diff --git a/locale/de/client.json b/locale/de/client.json
index d0933ec7d..fd919b3a3 100644
--- a/locale/de/client.json
+++ b/locale/de/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Bearbeiten",
   "action.markallasread": "Alle als gelesen markieren",
   "action.ok": "OK",
+  "action.postcomment": "",
   "action.postsfeed": "Beiträge-Feed",
   "action.respond": "Antworten",
   "action.save": "Sichern",
@@ -91,7 +92,9 @@
   "label.unfollow": "Entfolgen",
   "label.unread": "Ungelesen",
   "label.unsubscribe": "Abbestellen",
+  "label.vote": "",
   "label.voters": "Wähler",
+  "label.votes": "",
   "labels.notagsavailable": "Keine Tags verfügbar",
   "labels.notagsselected": "Keine Tags ausgewählt",
   "legal.agreement": "Ich habe die <0/> und <1/> gelesen und akzeptiere sie.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# Stimme} other {# Stimmen}}",
   "showpost.notificationspanel.message.subscribed": "Du erhältst Benachrichtigungen über Aktivitäten auf diesem Beitrag.",
   "showpost.notificationspanel.message.unsubscribed": "Du erhältst keine Benachrichtigungen über diesen Beitrag.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} Stimmen",
   "showpost.postsearch.query.placeholder": "Originalbeitrag suchen...",
   "showpost.response.date": "Status geändert zu {status} am {statusDate}",
   "showpost.responseform.message.mergedvotes": "Stimmen aus diesem Beitrag werden mit den Stimmen vom ursprünglichen Beitrag zusammengeführt.",
   "showpost.responseform.text.placeholder": "Was passiert in diesem Beitrag? Lass deine Benutzer wissen, was deine Pläne sind...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} mehr",
   "showpost.votespanel.seedetails": "Details anschauen",
   "signin.code.edit": "Bearbeiten",
+  "signin.code.expired": "Dieser Code ist abgelaufen oder wurde bereits verwendet. Bitte fordern Sie einen neuen an.",
   "signin.code.getnew": "Neuen Code anfordern",
   "signin.code.instruction": "Bitte geben Sie den soeben gesendeten Code an <0>{email}</0> ein.",
+  "signin.code.invalid": "Der eingegebene Code ist ungültig. Bitte versuchen Sie es erneut.",
   "signin.code.placeholder": "Geben Sie hier den Code ein.",
   "signin.code.sent": "Ein neuer Code wurde an Ihre E-Mail-Adresse gesendet.",
   "signin.code.submit": "Einreichen",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Ihr Name",
   "validation.custom.maxattachments": "Es sind maximal {number} Anhänge zulässig.",
   "validation.custom.maximagesize": "Die Bildgröße muss kleiner als {kilobytes}KB sein.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# Tag} other {# Tags}}",
-  "signin.code.expired": "Dieser Code ist abgelaufen oder wurde bereits verwendet. Bitte fordern Sie einen neuen an.",
-  "signin.code.invalid": "Der eingegebene Code ist ungültig. Bitte versuchen Sie es erneut."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# Tag} other {# Tags}}"
 }
\ No newline at end of file
diff --git a/locale/el/client.json b/locale/el/client.json
index ceb1a4836..284c535d9 100644
--- a/locale/el/client.json
+++ b/locale/el/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Επεξεργασία",
   "action.markallasread": "Σήμανση όλων ως αναγνωσμένων",
   "action.ok": "ΟΚ",
+  "action.postcomment": "",
   "action.postsfeed": "Ροή αναρτήσεων",
   "action.respond": "Απάντηση",
   "action.save": "Αποθήκευση",
@@ -91,7 +92,9 @@
   "label.unfollow": "Κατάργηση παρακολούθησης",
   "label.unread": "Αδιάβαστο",
   "label.unsubscribe": "Απεγγραφή",
+  "label.vote": "",
   "label.voters": "Ψηφοφόροι",
+  "label.votes": "",
   "labels.notagsavailable": "Δεν υπάρχουν διαθέσιμες ετικέτες",
   "labels.notagsselected": "Δεν έχουν επιλεγεί ετικέτες",
   "legal.agreement": "Έχω διαβάσει και συμφωνώ με το <0/> και <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Λαμβάνετε ειδοποιήσεις σχετικά με δραστηριότητα σε αυτή τη δημοσίευση.",
   "showpost.notificationspanel.message.unsubscribed": "Δεν θα λάβετε καμία ειδοποίηση σχετικά με αυτή τη δημοσίευση.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} Ψήφοι",
   "showpost.postsearch.query.placeholder": "Αναζήτηση αρχικής ανάρτησης...",
   "showpost.response.date": "Η κατάσταση άλλαξε σε {status} στις {statusDate}",
   "showpost.responseform.message.mergedvotes": "Οι ψήφοι από αυτό το post θα συγχωνευτούν στο αρχικό post.",
   "showpost.responseform.text.placeholder": "Τι συμβαίνει με αυτή την ανάρτηση; Αφήστε τους χρήστες σας να γνωρίζουν ποια είναι τα σχέδιά σας...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} περισσότερα",
   "showpost.votespanel.seedetails": "δείτε λεπτομέρειες",
   "signin.code.edit": "Εκδίδω",
+  "signin.code.expired": "Αυτός ο κωδικός έχει λήξει ή έχει ήδη χρησιμοποιηθεί. Παρακαλούμε ζητήστε έναν νέο.",
   "signin.code.getnew": "Λήψη νέου κωδικού",
   "signin.code.instruction": "Παρακαλώ πληκτρολογήστε τον κωδικό που μόλις στείλαμε στη διεύθυνση <0>{email}</0>",
+  "signin.code.invalid": "Ο κωδικός που εισαγάγατε δεν είναι έγκυρος. Δοκιμάστε ξανά.",
   "signin.code.placeholder": "Πληκτρολογήστε τον κωδικό εδώ",
   "signin.code.sent": "Ένας νέος κωδικός έχει σταλεί στο email σας.",
   "signin.code.submit": "Υποτάσσομαι",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Το όνομά σας",
   "validation.custom.maxattachments": "Επιτρέπονται έως {number} συνημμένα.",
   "validation.custom.maximagesize": "Το μέγεθος της εικόνας πρέπει να είναι μικρότερο από {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# ετικέτα} other {# ετικέτες}}",
-  "signin.code.expired": "Αυτός ο κωδικός έχει λήξει ή έχει ήδη χρησιμοποιηθεί. Παρακαλούμε ζητήστε έναν νέο.",
-  "signin.code.invalid": "Ο κωδικός που εισαγάγατε δεν είναι έγκυρος. Δοκιμάστε ξανά."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# ετικέτα} other {# ετικέτες}}"
 }
\ No newline at end of file
diff --git a/locale/en/client.json b/locale/en/client.json
index 9fecb8f4b..abcfaede4 100644
--- a/locale/en/client.json
+++ b/locale/en/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Edit",
   "action.markallasread": "Mark All as Read",
   "action.ok": "OK",
+  "action.postcomment": "Post Comment",
   "action.postsfeed": "Posts Feed",
   "action.respond": "Respond",
   "action.save": "Save",
@@ -90,7 +91,9 @@
   "label.unfollow": "Unfollow",
   "label.unread": "Unread",
   "label.unsubscribe": "Unsubscribe",
+  "label.vote": "Vote",
   "label.voters": "Voters",
+  "label.votes": "Votes",
   "labels.notagsavailable": "No tags available",
   "labels.notagsselected": "No tags selected",
   "legal.agreement": "I have read and agree to the <0/> and <1/>.",
@@ -195,11 +198,14 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "You’re receiving notifications about activity on this post.",
   "showpost.notificationspanel.message.unsubscribed": "You'll not receive any notification about this post.",
+  "showpost.postedby": "Posted by",
   "showpost.postsearch.numofvotes": "{0} votes",
   "showpost.postsearch.query.placeholder": "Search original post...",
   "showpost.response.date": "Status changed to {status} on {statusDate}",
   "showpost.responseform.message.mergedvotes": "Votes from this post will be merged into original post.",
   "showpost.responseform.text.placeholder": "What's going on with this post? Let your users know what are your plans...",
+  "showpost.stayupdated.description": "Get notified about updates to this idea",
+  "showpost.stayupdated.title": "Stay Updated",
   "showpost.votespanel.more": "+{extraVotesCount} more",
   "showpost.votespanel.seedetails": "see details",
   "signin.code.edit": "Edit",
diff --git a/locale/es-ES/client.json b/locale/es-ES/client.json
index 2e3c31f16..aca4643b1 100644
--- a/locale/es-ES/client.json
+++ b/locale/es-ES/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Editar",
   "action.markallasread": "Marcar Todo como Leído",
   "action.ok": "Aceptar",
+  "action.postcomment": "",
   "action.postsfeed": "Feed de publicaciones",
   "action.respond": "Responder",
   "action.save": "Guardar",
@@ -91,7 +92,9 @@
   "label.unfollow": "Dejar de seguir",
   "label.unread": "Sin leer",
   "label.unsubscribe": "Cancelar la suscripción",
+  "label.vote": "",
   "label.voters": "Votantes",
+  "label.votes": "",
   "labels.notagsavailable": "No hay etiquetas disponibles",
   "labels.notagsselected": "No hay etiquetas seleccionadas",
   "legal.agreement": "He leído y acepto los <0/> y <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Has recibido notificaciones sobre la actividad en este mensaje.",
   "showpost.notificationspanel.message.unsubscribed": "No recibirás ninguna notificación sobre este evento.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} votos",
   "showpost.postsearch.query.placeholder": "Buscar publicación original...",
   "showpost.response.date": "El estado cambió a {status} el {statusDate}",
   "showpost.responseform.message.mergedvotes": "Los votos de esta publicación se fusionarán en la publicación original.",
   "showpost.responseform.text.placeholder": "¿Qué está pasando con esta publicación? Dile a tus usuarios cuáles son tus planes...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} más",
   "showpost.votespanel.seedetails": "ver detalles",
   "signin.code.edit": "Editar",
+  "signin.code.expired": "Este código ha caducado o ya se ha utilizado. Por favor, solicite uno nuevo.",
   "signin.code.getnew": "Obtén un nuevo código",
   "signin.code.instruction": "Por favor, introduzca el código que le acabamos de enviar a <0>{email}</0>",
+  "signin.code.invalid": "El código que has introducido no es válido. Por favor, inténtalo de nuevo.",
   "signin.code.placeholder": "Escriba el código aquí.",
   "signin.code.sent": "Se ha enviado un nuevo código a su correo electrónico.",
   "signin.code.submit": "Entregar",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Su nombre",
   "validation.custom.maxattachments": "Se permite un máximo de {number} archivos adjuntos.",
   "validation.custom.maximagesize": "El tamaño de la imagen debe ser menor que {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiqueta} other {# etiquetas}}",
-  "signin.code.expired": "Este código ha caducado o ya se ha utilizado. Por favor, solicite uno nuevo.",
-  "signin.code.invalid": "El código que has introducido no es válido. Por favor, inténtalo de nuevo."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiqueta} other {# etiquetas}}"
 }
\ No newline at end of file
diff --git a/locale/fa/client.json b/locale/fa/client.json
index 78f2330a0..5f1f31228 100644
--- a/locale/fa/client.json
+++ b/locale/fa/client.json
@@ -10,6 +10,7 @@
   "action.edit": "ویرایش",
   "action.markallasread": "علامت‌گذاری همه به‌عنوان خوانده‌شده",
   "action.ok": "باشه",
+  "action.postcomment": "",
   "action.postsfeed": "فید پست‌ها",
   "action.respond": "پاسخ",
   "action.save": "ذخیره",
@@ -91,7 +92,9 @@
   "label.unfollow": "لغو دنبال‌کردن",
   "label.unread": "خوانده‌نشده",
   "label.unsubscribe": "لغو اشتراک",
+  "label.vote": "",
   "label.voters": "رأی‌دهندگان",
+  "label.votes": "",
   "labels.notagsavailable": "برچسبی در دسترس نیست",
   "labels.notagsselected": "برچسبی انتخاب نشده است",
   "legal.agreement": "من <0/> و <1/> را خوانده‌ام و قبول دارم.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# رأی} other {# رأی}}",
   "showpost.notificationspanel.message.subscribed": "شما اعلان‌های این پست را دریافت می‌کنید.",
   "showpost.notificationspanel.message.unsubscribed": "شما اعلانی برای این پست دریافت نخواهید کرد.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} رأی",
   "showpost.postsearch.query.placeholder": "جستجوی پست اصلی...",
   "showpost.response.date": "وضعیت در {statusDate} به {status} تغییر کرد",
   "showpost.responseform.message.mergedvotes": "رأی‌های این پست در پست اصلی ادغام می‌شود.",
   "showpost.responseform.text.placeholder": "برنامهٔ خود را دربارهٔ این پست با کاربران در میان بگذارید...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} بیشتر",
   "showpost.votespanel.seedetails": "مشاهدهٔ جزئیات",
   "signin.code.edit": "ویرایش",
+  "signin.code.expired": "این کد منقضی شده یا قبلاً استفاده شده است. لطفاً کد جدیدی درخواست کنید.",
   "signin.code.getnew": "دریافت کد جدید",
   "signin.code.instruction": "لطفا کدی که به <0>{email}</0> ارسال کردیم را وارد کنید.",
+  "signin.code.invalid": "کدی که وارد کردید نامعتبر است. لطفاً دوباره امتحان کنید.",
   "signin.code.placeholder": "کد را اینجا تایپ کنید",
   "signin.code.sent": "کد جدید به ایمیل شما ارسال شد.",
   "signin.code.submit": "ارسال",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "نام شما",
   "validation.custom.maxattachments": "حداکثر تعداد {number} پیوست مجاز است.",
   "validation.custom.maximagesize": "حجم تصویر باید کمتر از {kilobytes}KB باشد.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# برچسب} other {# برچسب}}",
-  "signin.code.expired": "این کد منقضی شده یا قبلاً استفاده شده است. لطفاً کد جدیدی درخواست کنید.",
-  "signin.code.invalid": "کدی که وارد کردید نامعتبر است. لطفاً دوباره امتحان کنید."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# برچسب} other {# برچسب}}"
 }
\ No newline at end of file
diff --git a/locale/fr/client.json b/locale/fr/client.json
index fcc6fe120..a2ee11301 100644
--- a/locale/fr/client.json
+++ b/locale/fr/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Modifier",
   "action.markallasread": "Tout marquer comme lu",
   "action.ok": "D'ACCORD",
+  "action.postcomment": "",
   "action.postsfeed": "Flux de publications",
   "action.respond": "Répondre",
   "action.save": "Enregistrer",
@@ -91,7 +92,9 @@
   "label.unfollow": "Ne plus suivre",
   "label.unread": "Non lu",
   "label.unsubscribe": "Se désabonner",
+  "label.vote": "",
   "label.voters": "Votants",
+  "label.votes": "",
   "labels.notagsavailable": "Aucune étiquette disponible",
   "labels.notagsselected": "Aucune balise sélectionnée",
   "legal.agreement": "J'ai lu et j'accepte les <0/> et <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# vote} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Vous recevrez des notifications sur l'activité de ce message.",
   "showpost.notificationspanel.message.unsubscribed": "Vous ne recevrez aucune notification à propos de ce message.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} votes",
   "showpost.postsearch.query.placeholder": "Rechercher le message original...",
   "showpost.response.date": "Le statut a été changé en {status} le {statusDate}",
   "showpost.responseform.message.mergedvotes": "Les votes de ce message seront fusionnés dans le message original.",
   "showpost.responseform.text.placeholder": "Que se passe-t-il avec ce message ? Faites savoir à vos utilisateurs quels sont vos plans...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} de plus",
   "showpost.votespanel.seedetails": "voir les détails",
   "signin.code.edit": "Modifier",
+  "signin.code.expired": "Ce code a expiré ou a déjà été utilisé. Veuillez en demander un nouveau.",
   "signin.code.getnew": "Obtenez un nouveau code",
   "signin.code.instruction": "Veuillez saisir le code que nous venons d'envoyer à <0>{email}</0>",
+  "signin.code.invalid": "Le code que vous avez saisi est invalide. Veuillez réessayer.",
   "signin.code.placeholder": "Saisissez le code ici",
   "signin.code.sent": "Un nouveau code a été envoyé à votre adresse e-mail.",
   "signin.code.submit": "Soumettre",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Votre nom",
   "validation.custom.maxattachments": "Un maximum de {number} pièces jointes est autorisé.",
   "validation.custom.maximagesize": "La taille de l'image doit être inférieure à {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "Ce code a expiré ou a déjà été utilisé. Veuillez en demander un nouveau.",
-  "signin.code.invalid": "Le code que vous avez saisi est invalide. Veuillez réessayer."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/it/client.json b/locale/it/client.json
index 008c95cc1..5c027ce80 100644
--- a/locale/it/client.json
+++ b/locale/it/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Modifica",
   "action.markallasread": "Segna tutto come letto",
   "action.ok": "OK",
+  "action.postcomment": "",
   "action.postsfeed": "Feed dei post",
   "action.respond": "Rispondi",
   "action.save": "Salva",
@@ -91,7 +92,9 @@
   "label.unfollow": "Non seguire più",
   "label.unread": "Non letto",
   "label.unsubscribe": "Disiscriversi",
+  "label.vote": "",
   "label.voters": "Votanti",
+  "label.votes": "",
   "labels.notagsavailable": "Nessun tag disponibile",
   "labels.notagsselected": "Nessun tag selezionato",
   "legal.agreement": "Ho letto e accetto le <0/> e <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Stai ricevendo notifiche sull'attività di questo post.",
   "showpost.notificationspanel.message.unsubscribed": "Non riceverai alcuna notifica su questo post.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} voti",
   "showpost.postsearch.query.placeholder": "Cerca post originale...",
   "showpost.response.date": "Stato modificato in {status} il {statusDate}",
   "showpost.responseform.message.mergedvotes": "I voti di questo post saranno uniti al post originale.",
   "showpost.responseform.text.placeholder": "Cosa succede con questo post? Fate sapere ai vostri utenti quali sono i vostri piani...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} di più",
   "showpost.votespanel.seedetails": "vedi dettagli",
   "signin.code.edit": "Modificare",
+  "signin.code.expired": "Questo codice è scaduto o è già stato utilizzato. Richiedine uno nuovo.",
   "signin.code.getnew": "Ottieni un nuovo codice",
   "signin.code.instruction": "Inserisci il codice che abbiamo appena inviato a <0>{email}</0>",
+  "signin.code.invalid": "Il codice inserito non è valido. Riprova.",
   "signin.code.placeholder": "Inserisci il codice qui",
   "signin.code.sent": "Un nuovo codice è stato inviato alla tua email.",
   "signin.code.submit": "Invia",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Il tuo nome",
   "validation.custom.maxattachments": "Sono consentiti al massimo {number} allegati.",
   "validation.custom.maximagesize": "La dimensione dell'immagine deve essere inferiore a {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "Questo codice è scaduto o è già stato utilizzato. Richiedine uno nuovo.",
-  "signin.code.invalid": "Il codice inserito non è valido. Riprova."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/ja/client.json b/locale/ja/client.json
index ea0fc08df..588850979 100644
--- a/locale/ja/client.json
+++ b/locale/ja/client.json
@@ -10,6 +10,7 @@
   "action.edit": "編集",
   "action.markallasread": "すべて既読にする",
   "action.ok": "わかりました",
+  "action.postcomment": "",
   "action.postsfeed": "投稿フィード",
   "action.respond": "回答",
   "action.save": "保存",
@@ -91,7 +92,9 @@
   "label.unfollow": "フォロー解除",
   "label.unread": "未読",
   "label.unsubscribe": "購読の解除",
+  "label.vote": "",
   "label.voters": "投票者",
+  "label.votes": "",
   "labels.notagsavailable": "利用可能なタグはありません",
   "labels.notagsselected": "タグが選択されていません",
   "legal.agreement": "私は<0/>と<1/>を読み、同意しました。",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "この投稿のアクティビティに関する通知を受け取ります。",
   "showpost.notificationspanel.message.unsubscribed": "この投稿についての通知は届きません。",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "投票数：{0} ",
   "showpost.postsearch.query.placeholder": "オリジナルの投稿を検索...",
   "showpost.response.date": "{status} のステータスが {statusDate}に変更されました",
   "showpost.responseform.message.mergedvotes": "この投稿からの投票は元の投稿にマージされます。",
   "showpost.responseform.text.placeholder": "この記事はどうなっていますか? あなたのプランをユーザーに知らせてください...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} 以上",
   "showpost.votespanel.seedetails": "詳細を表示",
   "signin.code.edit": "編集",
+  "signin.code.expired": "このコードは期限切れか、既に使用されています。新しいコードをリクエストしてください。",
   "signin.code.getnew": "新しいコードを取得する",
   "signin.code.instruction": "<0>{email}</0> に送信したコードを入力してください。",
+  "signin.code.invalid": "入力したコードは無効です。もう一度お試しください。",
   "signin.code.placeholder": "ここにコードを入力してください",
   "signin.code.sent": "新しいコードがあなたのメールに送信されました。",
   "signin.code.submit": "提出する",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "あなたの名前",
   "validation.custom.maxattachments": "最大 {number} 個の添付ファイルが許可されます。",
   "validation.custom.maximagesize": "画像サイズは{kilobytes}KB未満である必要があります。",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "このコードは期限切れか、既に使用されています。新しいコードをリクエストしてください。",
-  "signin.code.invalid": "入力したコードは無効です。もう一度お試しください。"
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/nl/client.json b/locale/nl/client.json
index c6837a0b3..88f552ce9 100644
--- a/locale/nl/client.json
+++ b/locale/nl/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Bewerken",
   "action.markallasread": "Markeer alles als gelezen",
   "action.ok": "OK",
+  "action.postcomment": "",
   "action.postsfeed": "Berichtenfeed",
   "action.respond": "Reageren",
   "action.save": "Opslaan",
@@ -91,7 +92,9 @@
   "label.unfollow": "Ontvolgen",
   "label.unread": "Ongelezen",
   "label.unsubscribe": "Uitschrijven",
+  "label.vote": "",
   "label.voters": "Stemmers",
+  "label.votes": "",
   "labels.notagsavailable": "Geen tags beschikbaar",
   "labels.notagsselected": "Geen tags geselecteerd",
   "legal.agreement": "Ik heb de <0/> en <1/> gelezen en ga hiermee akkoord.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Je ontvangt meldingen over activiteiten op dit bericht.",
   "showpost.notificationspanel.message.unsubscribed": "Je ontvangt geen meldingen over dit bericht.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} stemmen",
   "showpost.postsearch.query.placeholder": "Zoek origineel bericht...",
   "showpost.response.date": "Status gewijzigd naar {status} op {statusDate}",
   "showpost.responseform.message.mergedvotes": "Stemmen van dit bericht zullen worden samengevoegd met het originele bericht.",
   "showpost.responseform.text.placeholder": "Wat gebeurt er met dit bericht? Laat je gebruikers weten wat je plannen zijn...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} meer",
   "showpost.votespanel.seedetails": "details bekijken",
   "signin.code.edit": "Bewerking",
+  "signin.code.expired": "Deze code is verlopen of al gebruikt. Vraag een nieuwe aan.",
   "signin.code.getnew": "Ontvang een nieuwe code",
   "signin.code.instruction": "Typ de code in die we zojuist naar <0>{email}</0> hebben gestuurd",
+  "signin.code.invalid": "De ingevoerde code is ongeldig. Probeer het opnieuw.",
   "signin.code.placeholder": "Typ hier de code in",
   "signin.code.sent": "Er is een nieuwe code naar uw e-mailadres verzonden.",
   "signin.code.submit": "Indienen",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Jouw naam",
   "validation.custom.maxattachments": "Er zijn maximaal {number} bijlagen toegestaan.",
   "validation.custom.maximagesize": "De afbeeldingsgrootte moet kleiner zijn dan {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "Deze code is verlopen of al gebruikt. Vraag een nieuwe aan.",
-  "signin.code.invalid": "De ingevoerde code is ongeldig. Probeer het opnieuw."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/pl/client.json b/locale/pl/client.json
index 285454b70..58f62cc08 100644
--- a/locale/pl/client.json
+++ b/locale/pl/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Edytuj",
   "action.markallasread": "Oznacz wszystkie jako przeczytane",
   "action.ok": "OK",
+  "action.postcomment": "",
   "action.postsfeed": "Kanał postów",
   "action.respond": "Odpowiedz",
   "action.save": "Zapisz",
@@ -91,7 +92,9 @@
   "label.unfollow": "Przestań obserwować",
   "label.unread": "Nieprzeczytane",
   "label.unsubscribe": "Zrezygnuj z subskrypcji",
+  "label.vote": "",
   "label.voters": "Głosujący",
+  "label.votes": "",
   "labels.notagsavailable": "Brak dostępnych tagów",
   "labels.notagsselected": "Nie wybrano tagów",
   "legal.agreement": "Przeczytałem i zgadzam się z <0/> i <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Otrzymujesz powiadomienia o aktywności tego posta.",
   "showpost.notificationspanel.message.unsubscribed": "Nie będziesz otrzymywał żadnych powiadomień o o tym poście.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} głosów",
   "showpost.postsearch.query.placeholder": "Szukaj oryginalnego posta...",
   "showpost.response.date": "Status zmieniono na {status} dnia {statusDate}",
   "showpost.responseform.message.mergedvotes": "Głosy z tego posta zostaną scalone z oryginalnym postem.",
   "showpost.responseform.text.placeholder": "Co się dzieje w temacie tego posta? Daj swoim użytkownikom znać o swoich planach...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} więcej",
   "showpost.votespanel.seedetails": "pokaż szczegóły",
   "signin.code.edit": "Redagować",
+  "signin.code.expired": "Ten kod wygasł lub został już wykorzystany. Poproś o nowy.",
   "signin.code.getnew": "Uzyskaj nowy kod",
   "signin.code.instruction": "Proszę wpisać kod, który właśnie wysłaliśmy na adres <0>{email}</0>",
+  "signin.code.invalid": "Podany kod jest nieprawidłowy. Spróbuj ponownie.",
   "signin.code.placeholder": "Wpisz tutaj kod",
   "signin.code.sent": "Nowy kod został wysłany na Twój adres e-mail.",
   "signin.code.submit": "Składać",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Twoje imię",
   "validation.custom.maxattachments": "Maksymalna liczba załączników to {number}.",
   "validation.custom.maximagesize": "Rozmiar obrazu musi być mniejszy niż {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} few {# tagów} many {# tagów} other {# tagi}}",
-  "signin.code.expired": "Ten kod wygasł lub został już wykorzystany. Poproś o nowy.",
-  "signin.code.invalid": "Podany kod jest nieprawidłowy. Spróbuj ponownie."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} few {# tagów} many {# tagów} other {# tagi}}"
 }
\ No newline at end of file
diff --git a/locale/pt-BR/client.json b/locale/pt-BR/client.json
index 232e99447..43789ef09 100644
--- a/locale/pt-BR/client.json
+++ b/locale/pt-BR/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Editar",
   "action.markallasread": "Marcar todas como lidas",
   "action.ok": "OK",
+  "action.postcomment": "",
   "action.postsfeed": "Feed de postagens",
   "action.respond": "Responder",
   "action.save": "Salvar",
@@ -91,7 +92,9 @@
   "label.unfollow": "Deixar de seguir",
   "label.unread": "Não lidas",
   "label.unsubscribe": "Desinscrever-se",
+  "label.vote": "",
   "label.voters": "Votantes",
+  "label.votes": "",
   "labels.notagsavailable": "Não há tags disponíveis",
   "labels.notagsselected": "Nenhuma tag selecionada",
   "legal.agreement": "Eu li e concordo com os <0/> e <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# voto} other {# votos}}",
   "showpost.notificationspanel.message.subscribed": "Você está recebendo notificações sobre a atividade nesta postagem.",
   "showpost.notificationspanel.message.unsubscribed": "Você não receberá nenhuma notificação sobre esta postagem.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} votos",
   "showpost.postsearch.query.placeholder": "Procurar postagem original...",
   "showpost.response.date": "Status alterado para {status} em {statusDate}",
   "showpost.responseform.message.mergedvotes": "Votos desta publicação serão mesclados na postagem original.",
   "showpost.responseform.text.placeholder": "O que está acontecendo com esta postagem? Informe seus usuários quais são os seus planos...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} mais",
   "showpost.votespanel.seedetails": "ver detalhes",
   "signin.code.edit": "Editar",
+  "signin.code.expired": "Este código expirou ou já foi usado. Solicite um novo.",
   "signin.code.getnew": "Obtenha um novo código",
   "signin.code.instruction": "Por favor, digite o código que acabamos de enviar para <0>{email}</0>",
+  "signin.code.invalid": "O código que você digitou é inválido. Por favor, tente novamente.",
   "signin.code.placeholder": "Digite o código aqui",
   "signin.code.sent": "Um novo código foi enviado para o seu e-mail.",
   "signin.code.submit": "Enviar",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Seu nome",
   "validation.custom.maxattachments": "São permitidos no máximo {number} anexos.",
   "validation.custom.maximagesize": "O tamanho da imagem deve ser menor que {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "Este código expirou ou já foi usado. Solicite um novo.",
-  "signin.code.invalid": "O código que você digitou é inválido. Por favor, tente novamente."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/ru/client.json b/locale/ru/client.json
index 0552416ff..dd731034b 100644
--- a/locale/ru/client.json
+++ b/locale/ru/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Изменить",
   "action.markallasread": "Отметить всё как прочитанное",
   "action.ok": "ХОРОШО",
+  "action.postcomment": "",
   "action.postsfeed": "Лента сообщений",
   "action.respond": "Ответить",
   "action.save": "Сохранить",
@@ -91,7 +92,9 @@
   "label.unfollow": "Отписаться",
   "label.unread": "Непрочитанные",
   "label.unsubscribe": "Отписаться",
+  "label.vote": "",
   "label.voters": "Проголосовавшие",
+  "label.votes": "",
   "labels.notagsavailable": "Нет доступных тегов",
   "labels.notagsselected": "Теги не выбраны",
   "legal.agreement": "Я прочитал и согласен с <0/> и <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Вы подписаны на уведомления об активности в этом посте.",
   "showpost.notificationspanel.message.unsubscribed": "Вы не подписаны на уведомления об активности в этом посте.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} голосов",
   "showpost.postsearch.query.placeholder": "Выберите оригинальный пост...",
   "showpost.response.date": "Статус изменен на {status} на {statusDate}",
   "showpost.responseform.message.mergedvotes": "Голоса этого поста будут прибавлены к голосам оригинального поста.",
   "showpost.responseform.text.placeholder": "Что произойдёт с этим предложением? Дайте людям знать о ваших планах...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "и ещё {extraVotesCount}",
   "showpost.votespanel.seedetails": "подробнее",
   "signin.code.edit": "Редактировать",
+  "signin.code.expired": "Срок действия этого кода истёк или он уже был использован. Запросите новый.",
   "signin.code.getnew": "Получить новый код",
   "signin.code.instruction": "Пожалуйста, введите код, который мы только что отправили на номер <0>{email}</0>",
+  "signin.code.invalid": "Введённый вами код недействителен. Попробуйте ещё раз.",
   "signin.code.placeholder": "Введите код здесь",
   "signin.code.sent": "Новый код был отправлен на вашу электронную почту.",
   "signin.code.submit": "Представлять на рассмотрение",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Ваше имя",
   "validation.custom.maxattachments": "Разрешено максимум {number} вложений.",
   "validation.custom.maximagesize": "Размер изображения должен быть меньше {kilobytes}КБ.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "Срок действия этого кода истёк или он уже был использован. Запросите новый.",
-  "signin.code.invalid": "Введённый вами код недействителен. Попробуйте ещё раз."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/sk/client.json b/locale/sk/client.json
index 315593733..621bbdb48 100644
--- a/locale/sk/client.json
+++ b/locale/sk/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Upraviť",
   "action.markallasread": "Označiť všetko ako prečítané",
   "action.ok": "V poriadku",
+  "action.postcomment": "",
   "action.postsfeed": "Kanál príspevkov",
   "action.respond": "Odpovedať",
   "action.save": "Uložiť",
@@ -91,7 +92,9 @@
   "label.unfollow": "Prestať sledovať",
   "label.unread": "Neprečítané",
   "label.unsubscribe": "Zrušiť odber",
+  "label.vote": "",
   "label.voters": "Hlasujúci",
+  "label.votes": "",
   "labels.notagsavailable": "Značky nie sú dostupné",
   "labels.notagsselected": "Žiadne vybrané značky",
   "legal.agreement": "Prečítal som a súhlasím s <0/> a <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# hlas} few {# hlasy} other {# hlasov}}",
   "showpost.notificationspanel.message.subscribed": "Dostávate upozornenia na aktivitu v tomto príspevku.",
   "showpost.notificationspanel.message.unsubscribed": "Na tento príspevok nedostanete žiadne upozornenie.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} hlasov",
   "showpost.postsearch.query.placeholder": "Hľadať pôvodný príspevok...",
   "showpost.response.date": "Stav zmenený dňa {statusDate} na {status}",
   "showpost.responseform.message.mergedvotes": "Hlasy z tohto príspevku budú zlúčené do pôvodného príspevku.",
   "showpost.responseform.text.placeholder": "Čo sa deje s týmto príspevkom? Dajte svojim používateľom vedieť, aké máte plány...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} viac",
   "showpost.votespanel.seedetails": "pozri detaily",
   "signin.code.edit": "Upraviť",
+  "signin.code.expired": "Platnosť tohto kódu vypršala alebo už bol použitý. Požiadajte o nový.",
   "signin.code.getnew": "Získať nový kód",
   "signin.code.instruction": "Zadajte kód, ktorý sme práve poslali na adresu <0>{email}</0>",
+  "signin.code.invalid": "Zadaný kód je neplatný. Skúste to znova.",
   "signin.code.placeholder": "Sem zadajte kód",
   "signin.code.sent": "Nový kód bol odoslaný na váš e-mail.",
   "signin.code.submit": "Odoslať",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Vaše meno",
   "validation.custom.maxattachments": "Maximálny počet príloh je {number}.",
   "validation.custom.maximagesize": "Veľkosť obrázka musí byť menšia ako {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "Platnosť tohto kódu vypršala alebo už bol použitý. Požiadajte o nový.",
-  "signin.code.invalid": "Zadaný kód je neplatný. Skúste to znova."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/locale/sv-SE/client.json b/locale/sv-SE/client.json
index ee37f3784..e2c0c7df3 100644
--- a/locale/sv-SE/client.json
+++ b/locale/sv-SE/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Ändra",
   "action.markallasread": "Markera alla som lästa",
   "action.ok": "OK",
+  "action.postcomment": "",
   "action.postsfeed": "Inläggsflöde",
   "action.respond": "Svara",
   "action.save": "Spara",
@@ -91,7 +92,9 @@
   "label.unfollow": "Sluta följa",
   "label.unread": "Olästa",
   "label.unsubscribe": "Avsluta prenumeration",
+  "label.vote": "",
   "label.voters": "Röstande",
+  "label.votes": "",
   "labels.notagsavailable": "Inga taggar tillgängliga",
   "labels.notagsselected": "Inga taggar valda",
   "legal.agreement": "Jag har läst och godkänner <0/> och <1/>.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Du får aviseringar om aktivitet på det här inlägget.",
   "showpost.notificationspanel.message.unsubscribed": "Du får inte aviseringar för det här inlägget.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} röster",
   "showpost.postsearch.query.placeholder": "Sök i ursprungliga inlägget...",
   "showpost.response.date": "Status ändrades till {status} den {statusDate}",
   "showpost.responseform.message.mergedvotes": "Röster från det här inlägget kommer att flyttas till det ursprungliga inlägget.",
   "showpost.responseform.text.placeholder": "Vad händer med det här inlägget? Låt dina användare veta vad du planerar...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} ytterligare",
   "showpost.votespanel.seedetails": "visa detaljer",
   "signin.code.edit": "Redigera",
+  "signin.code.expired": "Denna kod har gått ut eller har redan använts. Vänligen begär en ny.",
   "signin.code.getnew": "Skaffa en ny kod",
   "signin.code.instruction": "Vänligen skriv in koden vi just skickade till <0>{email}</0>",
+  "signin.code.invalid": "Koden du angav är ogiltig. Försök igen.",
   "signin.code.placeholder": "Skriv in koden här",
   "signin.code.sent": "En ny kod har skickats till din e-postadress.",
   "signin.code.submit": "Överlämna",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Ditt namn",
   "validation.custom.maxattachments": "Maximalt {number} bilagor är tillåtna.",
   "validation.custom.maximagesize": "Bildstorleken måste vara mindre än {kilobytes}KB.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, =1 {# etikett} other {# etiketter}}",
-  "signin.code.expired": "Denna kod har gått ut eller har redan använts. Vänligen begär en ny.",
-  "signin.code.invalid": "Koden du angav är ogiltig. Försök igen."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, =1 {# etikett} other {# etiketter}}"
 }
\ No newline at end of file
diff --git a/locale/tr/client.json b/locale/tr/client.json
index b76f1ec1c..a630cac4f 100644
--- a/locale/tr/client.json
+++ b/locale/tr/client.json
@@ -10,6 +10,7 @@
   "action.edit": "Düzenle",
   "action.markallasread": "Tümünü Okundu olarak işaretle",
   "action.ok": "Tamam",
+  "action.postcomment": "",
   "action.postsfeed": "Gönderi Beslemesi",
   "action.respond": "Yanıtla",
   "action.save": "Kaydet",
@@ -91,7 +92,9 @@
   "label.unfollow": "Takipten çık",
   "label.unread": "Okunmamış",
   "label.unsubscribe": "Abonelikten çık",
+  "label.vote": "",
   "label.voters": "Oy verenler",
+  "label.votes": "",
   "labels.notagsavailable": "Hiçbir etiket mevcut değil",
   "labels.notagsselected": "Hiçbir etiket seçilmedi",
   "legal.agreement": "<0/> ve <1/> okudum ve onayladım.",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "Bu öneri üzerindeki hareketler hakkında bildirimler alacaksınız.",
   "showpost.notificationspanel.message.unsubscribed": "Bu öneri hakkında bildirim almayacaksınız.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} oy",
   "showpost.postsearch.query.placeholder": "Orijinal öneri ara...",
   "showpost.response.date": "Durum {statusDate} için {status} olarak değiştirildi",
   "showpost.responseform.message.mergedvotes": "Bu önerideki yorumlar orijinal öneriye dahil edilecek.",
   "showpost.responseform.text.placeholder": "Bu öneriye neler oluyor? Kullanıcılara planlarınız hakkında bilgi verin...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} daha",
   "showpost.votespanel.seedetails": "ayrıntıları gör",
   "signin.code.edit": "Düzenlemek",
+  "signin.code.expired": "Bu kodun süresi dolmuş veya daha önce kullanılmış. Lütfen yenisini talep edin.",
   "signin.code.getnew": "Yeni bir kod al",
   "signin.code.instruction": "Lütfen az önce <0>{email}</0> adresine gönderdiğimiz kodu yazın",
+  "signin.code.invalid": "Girdiğiniz kod geçersiz. Lütfen tekrar deneyin.",
   "signin.code.placeholder": "Kodu buraya yazın",
   "signin.code.sent": "E-postanıza yeni bir kod gönderildi.",
   "signin.code.submit": "Göndermek",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "Adınız",
   "validation.custom.maxattachments": "En fazla {number} ek dosyaya izin verilir.",
   "validation.custom.maximagesize": "Resim boyutu {kilobytes}KB'den küçük olmalıdır.",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiket} other {# etiket}}",
-  "signin.code.expired": "Bu kodun süresi dolmuş veya daha önce kullanılmış. Lütfen yenisini talep edin.",
-  "signin.code.invalid": "Girdiğiniz kod geçersiz. Lütfen tekrar deneyin."
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# etiket} other {# etiket}}"
 }
\ No newline at end of file
diff --git a/locale/zh-CN/client.json b/locale/zh-CN/client.json
index 8f4769f6d..966905616 100644
--- a/locale/zh-CN/client.json
+++ b/locale/zh-CN/client.json
@@ -10,6 +10,7 @@
   "action.edit": "编辑",
   "action.markallasread": "将全部标记为已读",
   "action.ok": "确定",
+  "action.postcomment": "",
   "action.postsfeed": "帖子提要",
   "action.respond": "回复/标记",
   "action.save": "保存",
@@ -91,7 +92,9 @@
   "label.unfollow": "取消关注",
   "label.unread": "未读",
   "label.unsubscribe": "取消订阅",
+  "label.vote": "",
   "label.voters": "投票者",
+  "label.votes": "",
   "labels.notagsavailable": "没有可用的标签",
   "labels.notagsselected": "未选择标签",
   "legal.agreement": "我已阅读并同意<0/>和<1/>。",
@@ -196,16 +199,21 @@
   "showpost.mostwanted.votes": "{count, plural, one {# votes} other {# votes}}",
   "showpost.notificationspanel.message.subscribed": "您正在收到有关此帖子活动的通知.",
   "showpost.notificationspanel.message.unsubscribed": "您将不会收到有关此帖子的任何通知.",
+  "showpost.postedby": "",
   "showpost.postsearch.numofvotes": "{0} 投票",
   "showpost.postsearch.query.placeholder": "搜索原始帖子...",
   "showpost.response.date": "状态于 {statusDate} 更改为 {status}",
   "showpost.responseform.message.mergedvotes": "此帖子的投票将合并到原始帖子中.",
   "showpost.responseform.text.placeholder": "这篇文章怎么了？让你的用户知道你的计划是什么...",
+  "showpost.stayupdated.description": "",
+  "showpost.stayupdated.title": "",
   "showpost.votespanel.more": "+{extraVotesCount} 更多",
   "showpost.votespanel.seedetails": "查看详细信息",
   "signin.code.edit": "编辑",
+  "signin.code.expired": "此优惠码已过期或已被使用，请申请新的优惠码。",
   "signin.code.getnew": "获取新代码",
   "signin.code.instruction": "请输入我们刚刚发送到 <0>{email}</0> 的验证码",
+  "signin.code.invalid": "您输入的验证码无效，请重试。",
   "signin.code.placeholder": "在此处输入代码",
   "signin.code.sent": "新的验证码已发送到您的邮箱。",
   "signin.code.submit": "提交",
@@ -222,7 +230,5 @@
   "signin.name.placeholder": "你的名字",
   "validation.custom.maxattachments": "最多允许 {number} 个附件。",
   "validation.custom.maximagesize": "图像大小必须小于{kilobytes}KB。",
-  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}",
-  "signin.code.expired": "此优惠码已过期或已被使用，请申请新的优惠码。",
-  "signin.code.invalid": "您输入的验证码无效，请重试。"
+  "{count, plural, one {# tag} other {# tags}}": "{count, plural, one {# tag} other {# tags}}"
 }
\ No newline at end of file
diff --git a/migrations/202512071400_add_welcome_header.sql b/migrations/202512071400_add_welcome_header.sql
new file mode 100644
index 000000000..23bce1266
--- /dev/null
+++ b/migrations/202512071400_add_welcome_header.sql
@@ -0,0 +1,2 @@
+-- Add welcome_header column to tenants table
+ALTER TABLE tenants ADD COLUMN welcome_header TEXT NULL DEFAULT '';
diff --git a/public/assets/images/chevron-up.svg b/public/assets/images/chevron-up.svg
new file mode 100644
index 000000000..0ef067896
--- /dev/null
+++ b/public/assets/images/chevron-up.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
+  <polyline points="18 15 12 9 6 15"></polyline>
+</svg>
diff --git a/public/assets/images/heroicons-filter.svg b/public/assets/images/heroicons-filter.svg
index 949a0acaf..ffa3684c1 100644
--- a/public/assets/images/heroicons-filter.svg
+++ b/public/assets/images/heroicons-filter.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M10.5 6h9.75M10.5 6a1.5 1.5 0 1 1-3 0m3 0a1.5 1.5 0 1 0-3 0M3.75 6H7.5m3 12h9.75m-9.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-3.75 0H7.5m9-6h3.75m-3.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-9.75 0h9.75" />
+  <path stroke-linecap="round" stroke-linejoin="round" d="M12 3c2.755 0 5.455.232 8.083.678.533.09.917.556.917 1.096v1.044a2.25 2.25 0 0 1-.659 1.591l-5.432 5.432a2.25 2.25 0 0 0-.659 1.591v2.927a2.25 2.25 0 0 1-1.244 2.013L9.75 21v-6.568a2.25 2.25 0 0 0-.659-1.591L3.659 7.409A2.25 2.25 0 0 1 3 5.818V4.774c0-.54.384-1.006.917-1.096A48.32 48.32 0 0 1 12 3Z" />
 </svg>
diff --git a/public/assets/images/heroicons-person.svg b/public/assets/images/heroicons-person.svg
new file mode 100644
index 000000000..883c7f4dd
--- /dev/null
+++ b/public/assets/images/heroicons-person.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z" />
+</svg>
diff --git a/public/assets/images/heroicons-trash.svg b/public/assets/images/heroicons-trash.svg
new file mode 100644
index 000000000..37a3374c3
--- /dev/null
+++ b/public/assets/images/heroicons-trash.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+</svg>
diff --git a/public/assets/styles/utility/display.scss b/public/assets/styles/utility/display.scss
index dd6c23b30..c8084139b 100644
--- a/public/assets/styles/utility/display.scss
+++ b/public/assets/styles/utility/display.scss
@@ -67,6 +67,14 @@
   }
 }
 
+@include media("xl2") {
+  .container {
+    width: 1320px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
+
 .box {
   border-radius: get("border.radius.large");
   background-color: var(--colors-white);
diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scss
index a2ffecf70..f11504fc2 100644
--- a/public/assets/styles/variables.scss
+++ b/public/assets/styles/variables.scss
@@ -30,17 +30,19 @@ $all: (
       small: 6px,
       medium: 8px,
       large: 12px,
+      xlarge: 20px,
       full: 999px,
     ),
   ),
 );
 
 // Queries
-$medias: "sm", "md", "lg", "xl";
+$medias: "sm", "md", "lg", "xl", "xl2";
 $sm-width: 576px;
 $md-width: 768px;
 $lg-width: 992px;
 $xl-width: 1200px;
+$xl2-width: 1400px;
 
 @mixin media($media) {
   @if $media == "sm" {
@@ -59,6 +61,10 @@ $xl-width: 1200px;
     @media only screen and (min-width: #{$xl-width}) {
       @content;
     }
+  } @else if $media == "xl2" {
+    @media only screen and (min-width: #{$xl2-width}) {
+      @content;
+    }
   }
 }
 
@@ -68,3 +74,15 @@ $xl-width: 1200px;
   background-image: none !important;
   pointer-events: none !important;
 }
+
+@mixin dark-mode() {
+  body[data-theme="dark"] & {
+    @content;
+  }
+}
+
+@mixin light-mode() {
+  body[data-theme="light"] & {
+    @content;
+  }
+}
diff --git a/public/assets/styles/variables/_text.scss b/public/assets/styles/variables/_text.scss
index 015668900..0ef975686 100644
--- a/public/assets/styles/variables/_text.scss
+++ b/public/assets/styles/variables/_text.scss
@@ -22,5 +22,6 @@ $font: (
     medium: 500,
     semibold: 600,
     bold: 700,
+    xbold: 800,
   ),
 );
diff --git a/public/components/Header.tsx b/public/components/Header.tsx
index e841b5a04..64b36af7e 100644
--- a/public/components/Header.tsx
+++ b/public/components/Header.tsx
@@ -1,10 +1,11 @@
 import React, { useState } from "react"
-import { SignInModal, RSSModal, TenantLogo, NotificationIndicator, UserMenu, ThemeSwitcher, Icon } from "@fider/components"
+import { SignInModal, RSSModal, TenantLogo, NotificationIndicator, UserMenu, ThemeSwitcher, Icon, Button } from "@fider/components"
 import { useFider } from "@fider/hooks"
 import { HStack } from "./layout"
 import { Trans } from "@lingui/react/macro"
 import { i18n } from "@lingui/core"
 import IconRss from "@fider/assets/images/heroicons-rss.svg"
+import IconArrowLeft from "@fider/assets/images/heroicons-arrowleft.svg"
 
 interface HeaderProps {
   hasInert?: boolean
@@ -15,8 +16,7 @@ export const Header = (props: HeaderProps) => {
   const [isSignInModalOpen, setIsSignInModalOpen] = useState(false)
   const [isRSSModalOpen, setIsRSSModalOpen] = useState(false)
 
-  const showSignInModal = (e: React.MouseEvent) => {
-    e.preventDefault()
+  const handleSignInClick = () => {
     setIsSignInModalOpen(true)
   }
 
@@ -60,9 +60,14 @@ export const Header = (props: HeaderProps) => {
                   </button>
                 )}
                 <ThemeSwitcher />
-                <a href="#" className="uppercase text-sm" onClick={showSignInModal}>
-                  <Trans id="action.signin">Sign in</Trans>
-                </a>
+                <Button variant="primary" size="default" onClick={handleSignInClick}>
+                  <HStack spacing={1} className="flex-items-center">
+                    <Icon sprite={IconArrowLeft} className="h-4" style={{ transform: "rotate(180deg)" }} />
+                    <span>
+                      <Trans id="action.signin">Sign in</Trans>
+                    </span>
+                  </HStack>
+                </Button>
               </HStack>
             )}
           </HStack>
diff --git a/public/components/Reactions.tsx b/public/components/Reactions.tsx
index 68b8c26ad..c50a285f1 100644
--- a/public/components/Reactions.tsx
+++ b/public/components/Reactions.tsx
@@ -75,7 +75,7 @@ export const Reactions: React.FC<ReactionsProps> = ({ emojiSelectorRef, toggleRe
                   "clickable hover:bg-gray-200": fider.session.isAuthenticated && !reaction.includesMe,
                 })}
               >
-                {reaction.emoji} <span className="ml-1 font-semibold">{reaction.count}</span>
+                {reaction.emoji} <span className="ml-1 text-semibold">{reaction.count}</span>
               </span>
             ))}
           </>
diff --git a/public/components/ShowPostResponse.tsx b/public/components/ShowPostResponse.tsx
index 2a77afeac..feafdd1bf 100644
--- a/public/components/ShowPostResponse.tsx
+++ b/public/components/ShowPostResponse.tsx
@@ -1,17 +1,17 @@
 import React from "react"
 import { PostResponse, PostStatus } from "@fider/models"
-import { Icon, Markdown } from "@fider/components"
+import { Icon, Markdown, UserName, Moment } from "@fider/components"
 import HeroIconDuplicate from "@fider/assets/images/heroicons-duplicate.svg"
 import HeroIconCheck from "@fider/assets/images/heroicons-check-circle.svg"
 import HeroIconSparkles from "@fider/assets/images/heroicons-sparkles-outline.svg"
 import HeroIconLightBulb from "@fider/assets/images/heroicons-lightbulb.svg"
 import HeroIconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
 import HeroIconThumbsDown from "@fider/assets/images/heroicons-thumbsdown.svg"
-import { HStack, VStack } from "./layout"
-import { timeSince } from "@fider/services"
+import { HStack } from "./layout"
 import { Trans } from "@lingui/react/macro"
+import { useFider } from "@fider/hooks"
 
-type Size = "micro" | "small" | "normal"
+type Size = "micro" | "small" | "xsmall" | "normal"
 
 interface PostResponseProps {
   status: string
@@ -20,30 +20,41 @@ interface PostResponseProps {
 }
 
 export const ResponseDetails = (props: PostResponseProps): JSX.Element | null => {
+  const fider = useFider()
   const status = PostStatus.Get(props.status)
 
   if (!props.response) {
     return null
   }
 
+  const { bg } = getLozengeProps(status)
+
   return (
-    <VStack align="start" spacing={4} className="bg-blue-50 p-3 border border-blue-200 rounded">
-      <ResponseLozenge response={props.response} status={props.status} />
-      <div className="text-semibold text-lg">{timeSince("en", new Date(), props.response.respondedAt, "date")}</div>
-      {props.response?.text && status !== PostStatus.Duplicate && (
-        <div className="content">
-          <Markdown text={props.response.text} style="full" />
+    <HStack spacing={4} align="start" className="c-response-details">
+      <div className={`c-response-details__card ${bg} `}>
+        <div className="c-response-details__header">
+          <HStack spacing={2} align="center">
+            <UserName user={props.response.user} />
+            <span className="text-xs text-gray-600">•</span>
+            <Moment className="text-xs text-gray-600" locale={fider.currentLocale} date={props.response.respondedAt} />
+          </HStack>
         </div>
-      )}
 
-      {status === PostStatus.Duplicate && props.response.original && (
-        <div className="content">
-          <a className="text-link" href={`/posts/${props.response.original.number}/${props.response.original.slug}`}>
-            {props.response.original.title}
-          </a>
-        </div>
-      )}
-    </VStack>
+        {props.response?.text && status !== PostStatus.Duplicate && (
+          <div className="c-response-details__content">
+            <Markdown text={props.response.text} style="full" />
+          </div>
+        )}
+
+        {status === PostStatus.Duplicate && props.response.original && (
+          <div className="c-response-details__content">
+            <a className="text-link" href={`/posts/${props.response.original.number}/${props.response.original.slug}`}>
+              {props.response.original.title}
+            </a>
+          </div>
+        )}
+      </div>
+    </HStack>
   )
 }
 
@@ -94,6 +105,17 @@ export const ResponseLozenge = (props: PostResponseProps): JSX.Element | null =>
     return <span className={`${color} text-sm`}>{translatedStatus}</span>
   }
 
+  if (props.size === "xsmall") {
+    return (
+      <div>
+        <HStack align="center" className={`${color} ${bg} rounded-full p-0 px-3`}>
+          <Icon sprite={icon} className={`h-4 c-status-col--${status.value}`} />
+          <span className={`c-status-col--${status.value} text-xs uppercase`}>{translatedStatus}</span>
+        </HStack>
+      </div>
+    )
+  }
+
   return (
     <div>
       <HStack align="start" className={`${color} ${bg} border ${border} rounded-full p-1 px-3`}>
diff --git a/public/components/VoteCounter.scss b/public/components/VoteCounter.scss
index 40d7926a7..b0f977b77 100644
--- a/public/components/VoteCounter.scss
+++ b/public/components/VoteCounter.scss
@@ -2,58 +2,129 @@
 
 .c-vote-counter {
   &__button {
-    font-size: get("font.size.lg");
-    width: sizing(12);
-    height: sizing(12);
+    width: sizing(14);
+    height: sizing(14);
     cursor: pointer;
     text-align: center;
     margin: 0 auto;
-    padding: 3px 0 8px 0;
-    color: var(--colors-gray-600);
+    padding: spacing(3) 0;
+    color: var(--colors-primary-base);
     display: flex;
     flex-direction: column;
     align-items: center;
-    border-radius: 8px;
-    transition: all 0.15s ease;
-    background-color: transparent;
-    border: 1px solid transparent;
-
-    svg {
-      color: var(--colors-gray-600);
-      margin-bottom: -2px;
-      transition: all 0.15s ease;
+    justify-content: center;
+    gap: spacing(2);
+    border-radius: 16px;
+    transition: all 0.2s ease;
+    background-color: var(--colors-blue-50);
+    border: 2px solid var(--colors-blue-100);
+
+    @include dark-mode {
+      background-color: var(--colors-blue-900);
+      border-color: var(--colors-blue-800);
+      color: var(--colors-blue-300);
     }
 
     &:hover {
-      background-color: var(--colors-gray-50);
+      background-color: var(--colors-blue-100);
+      border-color: var(--colors-primary-base);
       color: var(--colors-primary-base);
-      svg {
+
+      @include dark-mode {
+        background-color: var(--colors-blue-800);
+        border-color: var(--colors-blue-500);
+        color: var(--colors-blue-200);
+      }
+
+      .c-vote-counter__icon {
         color: var(--colors-primary-base);
-        transform: scale(1.1);
+        transform: translateY(-1px);
+
+        @include dark-mode {
+          color: var(--colors-blue-200);
+        }
       }
     }
 
     &--voted {
-      justify-content: center;
-      padding: 0;
+      padding: spacing(3) 0;
+      gap: spacing(2);
       font-weight: get("font.weight.bold");
-      background-color: var(--colors-blue-50);
+      background-color: var(--colors-blue-100);
       color: var(--colors-primary-base);
-      border-color: var(--colors-primary-light);
+      border-color: var(--colors-primary-base);
+
+      @include dark-mode {
+        background-color: var(--colors-blue-800);
+        color: var(--colors-blue-200);
+        border-color: var(--colors-blue-500);
+      }
 
-      svg {
+      .c-vote-counter__icon {
         color: var(--colors-primary-base);
+
+        @include dark-mode {
+          color: var(--colors-blue-200);
+        }
+      }
+
+      .c-vote-counter__count {
+        font-weight: get("font.weight.bold");
       }
 
       &:hover {
-        background-color: var(--colors-blue-100);
+        background-color: var(--colors-blue-200);
+        border-color: var(--colors-primary-base);
+
+        @include dark-mode {
+          background-color: var(--colors-blue-700);
+          border-color: var(--colors-blue-400);
+        }
       }
     }
 
     &--disabled {
-      justify-content: center;
-      padding: 0;
+      padding: spacing(3) 0;
+      gap: spacing(2);
       @include disabled();
     }
+
+    &--large {
+      width: sizing(18);
+      height: sizing(20);
+      padding: spacing(5) 0;
+      gap: spacing(2);
+      border-radius: 20px;
+
+      .c-vote-counter__icon {
+        width: 28px;
+        height: 28px;
+        stroke-width: 2.5;
+      }
+
+      .c-vote-counter__count {
+        font-size: 24px;
+        font-weight: get("font.weight.bold");
+        line-height: 1;
+      }
+    }
+  }
+
+  &__icon {
+    width: 18px;
+    height: 18px;
+    color: var(--colors-primary-base);
+    transition: all 0.2s ease;
+    flex-shrink: 0;
+
+    @include dark-mode {
+      color: var(--colors-blue-300);
+    }
+  }
+
+  &__count {
+    font-size: get("font.size.sm");
+    font-weight: get("font.weight.semibold");
+    line-height: 1;
   }
 }
diff --git a/public/components/VoteCounter.tsx b/public/components/VoteCounter.tsx
index 5604e153b..7f346675f 100644
--- a/public/components/VoteCounter.tsx
+++ b/public/components/VoteCounter.tsx
@@ -5,14 +5,16 @@ import { Post, PostStatus } from "@fider/models"
 import { actions, classSet } from "@fider/services"
 import { Icon, SignInModal } from "@fider/components"
 import { useFider } from "@fider/hooks"
-import FaCaretUp from "@fider/assets/images/fa-caretup.svg"
+import ChevronUp from "@fider/assets/images/chevron-up.svg"
 
 export interface VoteCounterProps {
   post: Post
+  size?: "default" | "large"
 }
 
 export const VoteCounter = (props: VoteCounterProps) => {
   const fider = useFider()
+  const { size = "default" } = props
   const [hasVoted, setHasVoted] = useState(props.post.hasVoted)
   const [votesCount, setVotesCount] = useState(props.post.votesCount)
   const [isSignInModalOpen, setIsSignInModalOpen] = useState(false)
@@ -38,23 +40,23 @@ export const VoteCounter = (props: VoteCounterProps) => {
   const isDisabled = status.closed || fider.isReadOnly
 
   const className = classSet({
-    "border-gray-200 border rounded-md bg-gray-100": true,
     "c-vote-counter__button": true,
     "c-vote-counter__button--voted": !status.closed && hasVoted,
     "c-vote-counter__button--disabled": isDisabled,
+    "c-vote-counter__button--large": size === "large",
   })
 
   const vote = (
     <button className={className} onClick={voteOrUndo}>
-      {!hasVoted && <Icon sprite={FaCaretUp} height="16" width="16" />}
-      {votesCount}
+      {!hasVoted && <Icon sprite={ChevronUp} className="c-vote-counter__icon" />}
+      <span className="c-vote-counter__count">{votesCount}</span>
     </button>
   )
 
   const disabled = (
     <button className={className}>
-      {!hasVoted && <Icon sprite={FaCaretUp} height="16" width="16" />}
-      {votesCount}
+      {!hasVoted && <Icon sprite={ChevronUp} className="c-vote-counter__icon" />}
+      <span className="c-vote-counter__count">{votesCount}</span>
     </button>
   )
 
diff --git a/public/components/common/Avatar.scss b/public/components/common/Avatar.scss
index a725df538..c00ef9682 100644
--- a/public/components/common/Avatar.scss
+++ b/public/components/common/Avatar.scss
@@ -5,5 +5,8 @@
   vertical-align: middle;
   display: inline-block;
   border: 2px solid var(--colors-white);
+  @include dark-mode {
+    border: 2px solid var(--colors-gray-200);
+  }
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1);
 }
diff --git a/public/components/common/Avatar.tsx b/public/components/common/Avatar.tsx
index 7475b579c..bc98d93bd 100644
--- a/public/components/common/Avatar.tsx
+++ b/public/components/common/Avatar.tsx
@@ -9,10 +9,10 @@ interface AvatarProps {
     avatarURL: string
     name: string
   }
-  size?: "small" | "normal"
+  size?: "small" | "normal" | "large"
 }
 
 export const Avatar = (props: AvatarProps) => {
-  const size = props.size === "small" ? "h-6 w-6" : "h-8 w-8"
+  const size = props.size === "small" ? "h-6 w-6" : props.size === "large" ? "h-11 w-11" : "h-8 w-8"
   return <img className={`c-avatar ${size}`} alt={props.user.name} src={`${props.user.avatarURL}?size=50`} />
 }
diff --git a/public/components/common/UserName.scss b/public/components/common/UserName.scss
index c76381f9f..bd37021b5 100644
--- a/public/components/common/UserName.scss
+++ b/public/components/common/UserName.scss
@@ -20,7 +20,7 @@
     div {
       svg {
         height: 14px;
-        vertical-align: text-bottom;
+        vertical-align: middle;
         margin-inline-start: 2px;
         align-items: flex-end;
       }
diff --git a/public/components/common/form/CommentEditor.scss b/public/components/common/form/CommentEditor.scss
index ae33d3b62..3cb547d71 100644
--- a/public/components/common/form/CommentEditor.scss
+++ b/public/components/common/form/CommentEditor.scss
@@ -75,6 +75,10 @@
   overflow: hidden;
   background-color: var(--colors-white);
 
+  @include dark-mode {
+    background-color: var(--colors-gray-100);
+  }
+
   &.m-error {
     border-color: var(--colors-red-600);
   }
diff --git a/public/models/identity.ts b/public/models/identity.ts
index 4e724f9e2..33728d220 100644
--- a/public/models/identity.ts
+++ b/public/models/identity.ts
@@ -6,6 +6,7 @@ export interface Tenant {
   locale: string
   invitation: string
   welcomeMessage: string
+  welcomeHeader: string
   status: TenantStatus
   isPrivate: boolean
   logoBlobKey: string
diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsx
index a08a2ed8c..1a44518fa 100644
--- a/public/pages/Administration/pages/GeneralSettings.page.tsx
+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx
@@ -11,6 +11,7 @@ const GeneralSettingsPage = () => {
   const fider = useFider()
   const [title, setTitle] = useState<string>(fider.session.tenant.name)
   const [welcomeMessage, setWelcomeMessage] = useState<string>(fider.session.tenant.welcomeMessage)
+  const [welcomeHeader, setWelcomeHeader] = useState<string>(fider.session.tenant.welcomeHeader)
   const [invitation, setInvitation] = useState<string>(fider.session.tenant.invitation)
   const [logo, setLogo] = useState<ImageUpload | undefined>(undefined)
   const [cname, setCNAME] = useState<string>(fider.session.tenant.cname)
@@ -18,7 +19,7 @@ const GeneralSettingsPage = () => {
   const [error, setError] = useState<Failure | undefined>(undefined)
 
   const handleSave = async (e: ButtonClickEvent) => {
-    const result = await actions.updateTenantSettings({ title, cname, welcomeMessage, invitation, logo, locale })
+    const result = await actions.updateTenantSettings({ title, cname, welcomeMessage, welcomeHeader, invitation, logo, locale })
     if (result.ok) {
       e.preventEnable()
       location.href = `/`
@@ -48,6 +49,20 @@ const GeneralSettingsPage = () => {
           <p className="text-muted">Keep it short and snappy. Your product / service name is usually best.</p>
         </Input>
 
+        <Input
+          field="welcomeHeader"
+          label="Welcome Header"
+          maxLength={100}
+          value={welcomeHeader}
+          disabled={!fider.session.user.isAdministrator}
+          placeholder="Help us build the _best feedback platform_"
+          onChange={setWelcomeHeader}
+        >
+          <p className="text-muted">
+            Large header text shown on the home page. Leave empty to hide. Wrap text with underscores (e.g., _highlighted_) to show it in blue.
+          </p>
+        </Input>
+
         <TextArea
           field="welcomeMessage"
           label="Welcome Message"
diff --git a/public/pages/Home/Home.page.scss b/public/pages/Home/Home.page.scss
index ee5910943..74475f864 100644
--- a/public/pages/Home/Home.page.scss
+++ b/public/pages/Home/Home.page.scss
@@ -5,6 +5,9 @@
   grid-template-columns: 1fr;
   column-gap: 0;
   row-gap: spacing(8);
+  background-color: var(--colors-gray-100);
+  padding-top: spacing(12);
+  padding-bottom: spacing(12);
 
   @include media("lg") {
     grid-template-columns: 1fr 1fr 1fr;
@@ -12,29 +15,75 @@
     row-gap: 0;
   }
 
+  @include dark-mode {
+    input {
+      background-color: var(--colors-gray-100);
+    }
+  }
+
   .p-home {
     &__welcome-col {
-      > :first-child {
-        background-color: var(--colors-white);
-        border-radius: get("border.radius.large");
-        border: 1px solid var(--colors-gray-200);
+      @include media("lg") {
+        padding-right: spacing(4);
+      }
+    }
+
+    &__welcome-title {
+      font-size: 32px;
+      font-weight: get("font.weight.xbold");
+      line-height: 1.2;
+      color: var(--colors-gray-900);
+      letter-spacing: -0.5px;
 
-        @include media("lg") {
-        }
+      @include media("lg") {
+        font-size: 36px;
       }
     }
 
+    &__welcome-body {
+      // font-size: get("font.size.lg");
+      line-height: 1.6;
+      // color: var(--colors-gray-700);
+    }
+
     &__posts-col {
+      grid-column: span 2 / span 2;
+    }
+
+    &__add-idea-btn {
+      width: 100%;
+      margin-bottom: spacing(6);
+      padding: spacing(5);
       background-color: var(--colors-white);
-      border-radius: get("border.radius.large");
       border: 1px solid var(--colors-gray-200);
+      border-radius: get("border.radius.xlarge");
+      box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+      cursor: pointer;
+      transition: box-shadow 0.2s ease-in-out;
+      font-size: get("font.size.lg");
+      font-weight: get("font.weight.medium");
+      color: var(--colors-gray-700);
+      text-align: left;
 
-      @include media("lg") {
+      @include dark-mode {
+        background-color: var(--colors-gray-200);
+      }
+
+      &:hover {
+        box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+      }
+
+      &:focus {
+        outline: 2px solid var(--colors-primary-base);
+        outline-offset: 2px;
       }
     }
 
-    &__posts-col {
-      grid-column: span 2 / span 2;
+    &__add-idea-icon {
+      width: 40px;
+      height: 40px;
+      color: var(--colors-primary-base);
+      flex-shrink: 0;
     }
   }
 }
diff --git a/public/pages/Home/Home.page.tsx b/public/pages/Home/Home.page.tsx
index f7a30b6af..c126f5234 100644
--- a/public/pages/Home/Home.page.tsx
+++ b/public/pages/Home/Home.page.tsx
@@ -1,12 +1,13 @@
 import "./Home.page.scss"
 import NoDataIllustration from "@fider/assets/images/undraw-no-data.svg"
+import IconPlusCircle from "@fider/assets/images/heroicons-pluscircle.svg"
 
 import React, { useEffect, useState } from "react"
 import { Post, Tag, PostStatus } from "@fider/models"
-import { Markdown, Hint, PoweredByFider, Icon, Header, Button } from "@fider/components"
+import { Markdown, Hint, PoweredByFider, Icon, Header } from "@fider/components"
 import { PostsContainer } from "./components/PostsContainer"
 import { useFider } from "@fider/hooks"
-import { VStack } from "@fider/components/layout"
+import { VStack, HStack } from "@fider/components/layout"
 import { ShareFeedback } from "./components/ShareFeedback"
 import { i18n } from "@lingui/core"
 import { Trans } from "@lingui/react/macro"
@@ -84,6 +85,34 @@ What can we do better? This is the place for you to vote, discuss and share idea
     setIsShareFeedbackOpen(true)
   }
 
+  const parseWelcomeHeader = (text: string): JSX.Element[] => {
+    const parts: JSX.Element[] = []
+    let currentIndex = 0
+    const regex = /_([^_]+)_/g
+    let match: RegExpExecArray | null
+
+    while ((match = regex.exec(text)) !== null) {
+      // Add text before the match
+      if (match.index > currentIndex) {
+        parts.push(<span key={currentIndex}>{text.slice(currentIndex, match.index)}</span>)
+      }
+      // Add the highlighted text
+      parts.push(
+        <span key={match.index} className="text-primary-base">
+          {match[1]}
+        </span>
+      )
+      currentIndex = regex.lastIndex
+    }
+
+    // Add remaining text
+    if (currentIndex < text.length) {
+      parts.push(<span key={currentIndex}>{text.slice(currentIndex)}</span>)
+    }
+
+    return parts
+  }
+
   return (
     <>
       <ShareFeedback
@@ -95,17 +124,23 @@ What can we do better? This is the place for you to vote, discuss and share idea
       <Header hasInert={isShareFeedbackOpen && !fider.isReadOnly} />
       <div id="p-home" className="page container" {...(isShareFeedbackOpen && !fider.isReadOnly && { inert: "true" })}>
         <div className="p-home__welcome-col">
-          <VStack spacing={2} className="p-4">
-            <Markdown text={fider.session.tenant.welcomeMessage || defaultWelcomeMessage} style="full" />
-            <Button className="c-input" type="submit" variant="secondary" onClick={handleNewPost}>
-              {fider.session.tenant.invitation || defaultInvitation}
-            </Button>
+          <VStack spacing={6}>
+            <div>
+              {fider.session.tenant.welcomeHeader && <h1 className="p-home__welcome-title mb-5">{parseWelcomeHeader(fider.session.tenant.welcomeHeader)}</h1>}
+              <Markdown className="p-home__welcome-body" text={fider.session.tenant.welcomeMessage || defaultWelcomeMessage} style="full" />
+            </div>
           </VStack>
-          <div onClick={() => setIsShareFeedbackOpen(true)}>
+          <div>
             <PoweredByFider slot="home-input" className="sm:hidden md:hidden lg:block mt-3" />
           </div>
         </div>
-        <div className="p-home__posts-col p-4">
+        <div className="p-home__posts-col">
+          <button className="p-home__add-idea-btn" onClick={handleNewPost}>
+            <HStack spacing={4} align="center">
+              <Icon sprite={IconPlusCircle} className="p-home__add-idea-icon" />
+              <span>{fider.session.tenant.invitation || defaultInvitation}</span>
+            </HStack>
+          </button>
           {isLonely() ? <Lonely /> : <PostsContainer posts={props.posts} tags={props.tags} countPerStatus={props.countPerStatus} />}
           <PoweredByFider slot="home-footer" className="lg:hidden xl:hidden mt-8" />
         </div>
diff --git a/public/pages/Home/components/ListPosts.tsx b/public/pages/Home/components/ListPosts.tsx
index 341d5ba87..1b268eaa9 100644
--- a/public/pages/Home/components/ListPosts.tsx
+++ b/public/pages/Home/components/ListPosts.tsx
@@ -1,8 +1,9 @@
 import React from "react"
 import { Post, Tag, CurrentUser } from "@fider/models"
-import { ShowTag, VoteCounter, Markdown, Icon, ResponseLozenge } from "@fider/components"
+import { ShowTag, Markdown, Icon, ResponseLozenge } from "@fider/components"
 import IconChatAlt2 from "@fider/assets/images/heroicons-chat-alt-2.svg"
 import { HStack, VStack } from "@fider/components/layout"
+import { Trans } from "@lingui/react/macro"
 
 interface ListPostsProps {
   posts?: Post[]
@@ -13,23 +14,19 @@ interface ListPostsProps {
 
 const ListPostItem = (props: { post: Post; user?: CurrentUser; tags: Tag[] }) => {
   return (
-    <HStack spacing={4} align="start" className="c-posts-container__post">
-      <div>
-        <VoteCounter post={props.post} />
-      </div>
-      <VStack className="w-full" spacing={2}>
+    <a href={`/posts/${props.post.number}/${props.post.slug}`} className="c-posts-container__post-link">
+      <VStack className="c-posts-container__post w-full" spacing={4}>
         {props.post.status !== "open" && (
-          <div className="mb-2 align-self-start">
+          <div className="mb-1 align-self-start">
             <ResponseLozenge status={props.post.status} response={props.post.response} size={"small"} />
           </div>
         )}
-        <HStack justify="between">
-          <a className="text-title text-break hover:text-primary-base" href={`/posts/${props.post.number}/${props.post.slug}`}>
-            {props.post.title}
-          </a>
+        <HStack justify="between" align="start">
+          <h3 className="c-posts-container__post-title text-break">{props.post.title}</h3>
           {props.post.commentsCount > 0 && (
-            <HStack className="text-muted">
-              {props.post.commentsCount} <Icon sprite={IconChatAlt2} className="h-4 ml-1" />
+            <HStack spacing={1} className="c-posts-container__post-comments flex-shrink-0">
+              <span>{props.post.commentsCount}</span>
+              <Icon sprite={IconChatAlt2} className="h-5 w-5" />
             </HStack>
           )}
         </HStack>
@@ -37,18 +34,22 @@ const ListPostItem = (props: { post: Post; user?: CurrentUser; tags: Tag[] }) =>
         {props.tags.length >= 1 && (
           <HStack spacing={0} className="gap-2 flex-wrap">
             {props.tags.map((tag) => (
-              <ShowTag key={tag.id} tag={tag} link />
+              <ShowTag key={tag.id} tag={tag} />
             ))}
           </HStack>
         )}
+        <div className="c-posts-container__post-votes">
+          <span className="text-semibold text-2xl">{props.post.votesCount}</span>{" "}
+          <span className="text-gray-700">{props.post.votesCount === 1 ? <Trans id="label.vote">Vote</Trans> : <Trans id="label.votes">Votes</Trans>}</span>
+        </div>
       </VStack>
-    </HStack>
+    </a>
   )
 }
 
 const MinimalListPostItem = (props: { post: Post; tags: Tag[] }) => {
   return (
-    <HStack spacing={4} align="start" className="c-posts-container__post">
+    <HStack spacing={4} align="start" className="c-posts-container__post-minimal">
       <HStack className="w-full" justify="between" align="start">
         <a className="text-link" href={`/posts/${props.post.number}/${props.post.slug}`}>
           {props.post.title}
@@ -85,11 +86,11 @@ export const ListPosts = (props: ListPostsProps) => {
           ))}
         </VStack>
       ) : (
-        <VStack spacing={4} divide>
+        <>
           {props.posts.map((post) => (
             <ListPostItem key={post.id} post={post} tags={props.tags.filter((tag) => post.tags.indexOf(tag.slug) >= 0)} />
           ))}
-        </VStack>
+        </>
       )}
     </>
   )
diff --git a/public/pages/Home/components/PostFilter.scss b/public/pages/Home/components/PostFilter.scss
index 4e4afb897..2ef6e4485 100644
--- a/public/pages/Home/components/PostFilter.scss
+++ b/public/pages/Home/components/PostFilter.scss
@@ -4,3 +4,43 @@
   margin: spacing(2);
   width: calc(100% - spacing(4));
 }
+
+.c-post-filter-btn,
+.c-post-sort-btn {
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+  height: 40px;
+  color: var(--colors-gray-700);
+  font-weight: get("font.weight.semibold");
+  font-size: get("font.size.xs");
+  border: 1px solid var(--colors-gray-200);
+  text-transform: uppercase;
+  background-color: var(--colors-white);
+  padding-inline: spacing(3) spacing(2);
+  border-radius: sizing(2);
+
+  @include dark-mode {
+    background-color: var(--colors-gray-300);
+    color: var(--colors-gray-800);
+    border-color: var(--colors-gray-400);
+  }
+
+  &:hover {
+    background-color: var(--colors-white);
+    border-color: var(--colors-gray-300);
+    box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+  }
+}
+
+// Override parent dropdown handle focus to apply to children
+.c-dropdown__handle:focus:not(.no-focus) {
+  border-color: transparent !important;
+  box-shadow: none !important;
+
+  .c-post-filter-btn,
+  .c-post-sort-btn {
+    border-color: var(--colors-primary-base) !important;
+    box-shadow: 0 0 0 3px rgba(45, 87, 237, 0.1), 0 1px 2px 0 rgb(0 0 0 / 0.05) !important;
+  }
+}
diff --git a/public/pages/Home/components/PostFilter.tsx b/public/pages/Home/components/PostFilter.tsx
index 0e739ab98..e9567f384 100644
--- a/public/pages/Home/components/PostFilter.tsx
+++ b/public/pages/Home/components/PostFilter.tsx
@@ -151,7 +151,7 @@ export const PostFilter = (props: PostFilterProps) => {
       <Dropdown
         onToggled={() => setQuery("")}
         renderHandle={
-          <HStack className="h-10 text-medium text-xs rounded-md uppercase border border-gray-400 text-gray-800 p-2 px-3">
+          <HStack className="c-post-filter-btn">
             <Icon sprite={HeroIconFilter} className="h-5 pr-1" />
             {i18n._({ id: "home.filter.label", message: "Filter" })}
             {filterCount > 0 && <div className="bg-gray-200 inline-block rounded-full px-2 py-1 w-min-4 text-2xs text-center">{filterCount}</div>}
diff --git a/public/pages/Home/components/PostsContainer.scss b/public/pages/Home/components/PostsContainer.scss
index 0f3245417..8f29a0906 100644
--- a/public/pages/Home/components/PostsContainer.scss
+++ b/public/pages/Home/components/PostsContainer.scss
@@ -5,7 +5,7 @@
     display: grid;
     grid-template-columns: 1fr 1fr 1fr 1fr;
     row-gap: spacing(4);
-    margin-bottom: spacing(5);
+    margin-bottom: spacing(6);
   }
 
   &__filter-col {
@@ -35,4 +35,72 @@
       grid-column: 1 / -1;
     }
   }
+
+  &__list {
+    display: flex;
+    flex-direction: column;
+    gap: spacing(4);
+  }
+
+  &__post-link {
+    display: block;
+    text-decoration: none;
+    color: inherit;
+  }
+
+  &__post {
+    background-color: var(--colors-white);
+    @include dark-mode {
+      background-color: var(--colors-gray-200);
+    }
+    border-radius: get("border.radius.xlarge");
+    padding: spacing(6) spacing(7);
+    box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+    transition: box-shadow 0.2s ease-in-out;
+
+    .c-posts-container__post-link:hover & {
+      box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+    }
+  }
+
+  &__post-title {
+    font-size: get("font.size.lg");
+    font-weight: get("font.weight.bold");
+    color: var(--colors-gray-900);
+    line-height: 1.4;
+    transition: color 0.2s ease-in-out;
+
+    .c-posts-container__post-link:hover & {
+      color: var(--colors-primary-base);
+    }
+  }
+
+  &__post-comments {
+    color: var(--colors-gray-500);
+    font-size: get("font.size.sm");
+    align-items: center;
+    margin-left: spacing(4);
+  }
+
+  &__postdescription {
+    color: var(--colors-gray-800);
+    font-size: get("font.size.base");
+    line-height: 1.6;
+  }
+
+  &__post-votes {
+    display: flex;
+    align-items: baseline;
+    gap: spacing(2);
+  }
+
+  &__post-minimal {
+    // Minimal styling for compact post lists (e.g., similar posts)
+    padding: spacing(2) 0;
+    border-bottom: 1px solid var(--colors-gray-200);
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
 }
diff --git a/public/pages/Home/components/PostsContainer.tsx b/public/pages/Home/components/PostsContainer.tsx
index 7f0c0b0ab..8329e8b98 100644
--- a/public/pages/Home/components/PostsContainer.tsx
+++ b/public/pages/Home/components/PostsContainer.tsx
@@ -144,7 +144,7 @@ export class PostsContainer extends React.Component<PostsContainerProps, PostsCo
 
     return (
       <div className="c-posts-container">
-        <div className="c-posts-container__header mb-5">
+        <div className="c-posts-container__header">
           {!this.state.query && (
             <div className="c-posts-container__filter-col">
               <PostFilter
@@ -167,19 +167,21 @@ export class PostsContainer extends React.Component<PostsContainerProps, PostsCo
             />
           </div>
         </div>
-        <ListPosts
-          posts={this.state.posts}
-          tags={this.props.tags}
-          emptyText={i18n._({ id: "home.postscontainer.label.noresults", message: "No results matched your search, try something different." })}
-        />
-        {this.state.loading && <Loader />}
-        {showMoreLink && (
-          <div className="my-4 ml-4">
-            <a href={showMoreLink} className="text-primary-base text-medium hover:underline" onClick={this.showMore}>
-              <Trans id="home.postscontainer.label.viewmore">View more posts</Trans>
-            </a>
-          </div>
-        )}
+        <div className="c-posts-container__list">
+          <ListPosts
+            posts={this.state.posts}
+            tags={this.props.tags}
+            emptyText={i18n._({ id: "home.postscontainer.label.noresults", message: "No results matched your search, try something different." })}
+          />
+          {this.state.loading && <Loader />}
+          {showMoreLink && (
+            <div className="my-4 text-center">
+              <a href={showMoreLink} className="text-primary-base text-medium hover:underline" onClick={this.showMore}>
+                <Trans id="home.postscontainer.label.viewmore">View more posts</Trans>
+              </a>
+            </div>
+          )}
+        </div>
       </div>
     )
   }
diff --git a/public/pages/Home/components/PostsSort.tsx b/public/pages/Home/components/PostsSort.tsx
index fc1fcae33..37d1b6520 100644
--- a/public/pages/Home/components/PostsSort.tsx
+++ b/public/pages/Home/components/PostsSort.tsx
@@ -1,11 +1,11 @@
 import React from "react"
 import { Dropdown } from "@fider/components"
-import { HStack } from "@fider/components/layout"
 import { i18n } from "@lingui/core"
 import IconSparkles from "@fider/assets/images/heroicons-sparkles-outline.svg"
 import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
 import IconChat from "@fider/assets/images/heroicons-chat-alt-2.svg"
 import IconClock from "@fider/assets/images/heroicons-clock.svg"
+import { HStack } from "@fider/components/layout"
 
 interface PostsSortProps {
   value: string
@@ -23,12 +23,12 @@ export const PostsSort: React.FC<PostsSortProps> = ({ value = "trending", onChan
   const selectedItem = options.find((x) => x.value === value) || options[0]
 
   return (
-    <HStack>
+    <div>
       <Dropdown
         renderHandle={
-          <div className="h-10 flex flex-items-center text-medium text-xs rounded-md uppercase border border-gray-400 text-gray-800 p-2 px-3">
+          <HStack className="c-post-sort-btn">
             {i18n._({ id: "home.postsort.label", message: "Sort by:" })} {selectedItem.label}
-          </div>
+          </HStack>
         }
       >
         {options.map((o) => (
@@ -37,6 +37,6 @@ export const PostsSort: React.FC<PostsSortProps> = ({ value = "trending", onChan
           </Dropdown.ListItem>
         ))}
       </Dropdown>
-    </HStack>
+    </div>
   )
 }
diff --git a/public/pages/Home/components/ShareFeedback.scss b/public/pages/Home/components/ShareFeedback.scss
index 44936000a..3bc081735 100644
--- a/public/pages/Home/components/ShareFeedback.scss
+++ b/public/pages/Home/components/ShareFeedback.scss
@@ -2,12 +2,28 @@
 
 .c-share-feedback {
   background-color: var(--colors-gray-200);
+
+  @include dark-mode {
+    background-color: var(--colors-gray-100);
+  }
+
+  @include dark-mode {
+    input {
+      background-color: var(--colors-gray-100);
+    }
+  }
+
   display: flex;
   flex-direction: column;
   height: 100%;
 
   &__content {
     background-color: var(--colors-white);
+
+    @include dark-mode {
+      background-color: var(--colors-gray-200);
+    }
+
     padding: spacing(6);
     border-radius: get("border.radius.large");
     max-width: 720px;
diff --git a/public/pages/ShowPost/ShowPost.page.scss b/public/pages/ShowPost/ShowPost.page.scss
index 969a00273..82131085d 100644
--- a/public/pages/ShowPost/ShowPost.page.scss
+++ b/public/pages/ShowPost/ShowPost.page.scss
@@ -1,32 +1,179 @@
 @use "~@fider/assets/styles/variables.scss" as *;
 
 #p-show-post {
+  background-color: var(--colors-gray-100);
+  padding-top: spacing(12);
+  padding-bottom: spacing(12);
+
   .post-header {
     flex-grow: 1;
   }
 
+  @include dark-mode {
+    input {
+      background-color: var(--colors-gray-100);
+    }
+  }
+
   .p-show-post {
     &__main-col {
-      // background-color: var(--colors-white);
-      padding: spacing(4);
-      border-radius: get("border.radius.large");
-      margin-bottom: spacing(4);
+      display: flex;
+      flex-direction: column;
+      gap: spacing(6);
+    }
+
+    &__post-card {
+      background-color: var(--colors-white);
+      @include dark-mode {
+        background-color: var(--colors-gray-200);
+      }
+      border-radius: get("border.radius.xlarge");
+      padding: spacing(7);
+      box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+      transition: box-shadow 0.2s ease-in-out;
+    }
+
+    &__title {
+      font-size: 20px;
+      font-weight: get("font.weight.xbold");
+      line-height: 1.2;
+      color: var(--colors-gray-900);
+
+      @include media("md") {
+        font-size: 32px;
+      }
+
+      @include media("lg") {
+        font-size: 36px;
+      }
+    }
+
+    &__meta {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      row-gap: spacing(2);
+    }
+
+    &__vote-section {
+      margin-top: spacing(10);
+    }
+
+    &__description-section {
+      margin-top: spacing(7);
+    }
+     ch &__description {
+      color: var(--colors-gray-800);
+      line-height: 1.6;
+    }
+
+    &__actions {
+      border-top: 5px solid var(--colors-blue-500);
+      padding-top: spacing(4);
+      margin-top: spacing(8);
+    }
+
+    &__discussion-section {
+      display: flex;
+      flex-direction: column;
+      gap: spacing(6);
+    }
+
+    &__discussion-header {
+      margin-bottom: spacing(2);
+    }
+
+    &__discussion-count {
+      width: 25px;
+      height: 25px;
+      margin-left: spacing(4);
+      border-radius: 9999px;
+      text-align: center;
+      background-color: var(--colors-blue-100);
+      color: var(--colors-blue-400);
+      @include dark-mode {
+        background-color: var(--colors-blue-500);
+        color: var(--colors-blue-800);
+      }
     }
 
     &__action-col {
-      > :first-child {
-        // background-color: var(--colors-white);
-        padding: spacing(4);
-        // border-radius: get("border.radius.large");
+      display: flex;
+      flex-direction: column;
+      gap: spacing(4);
+
+      @include media("sm") {
+        margin-top: spacing(6);
+      }
+
+      > .card {
+        background-color: var(--colors-white);
+        @include dark-mode {
+          background-color: var(--colors-gray-200);
+        }
+        border-radius: get("border.radius.xlarge");
+        padding: spacing(6);
+        box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+      }
+
+      &__follow-button--follow,
+      &__follow-button--following {
+        text-align: center;
+        color: var(--colors-gray-800);
+        background-color: var(--colors-white);
+        border: 1px solid var(--colors-gray-800);
+        width: 100%;
+        @include dark-mode {
+          background-color: var(--colors-gray-100);
+          border: 1px solid var(--colors-gray-400);
+        }
+      }
+    }
+  }
+
+  .c-comment-input {
+    // Hide avatar on mobile for comment input
+    @include media("sm") {
+      .c-avatar {
+        display: none;
       }
     }
   }
 
+  .c-comment-input-card {
+    flex-grow: 1;
+    background-color: var(--colors-white);
+    @include dark-mode {
+      background-color: var(--colors-gray-200);
+    }
+    border-radius: get("border.radius.xlarge");
+    padding: spacing(6);
+    box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+  }
+
+  .c-response-details {
+    &__card {
+      flex-grow: 1;
+      border-radius: get("border.radius.xlarge");
+      padding: spacing(4);
+      border-width: 2px;
+    }
+
+    &__header {
+      margin-bottom: spacing(3);
+    }
+
+    &__content {
+      color: var(--colors-gray-800);
+      line-height: 1.6;
+    }
+  }
+
   @include media("lg") {
     .p-show-post {
       display: grid;
       gap: spacing(6);
-      grid-template-columns: 2fr 6fr 1fr;
+      grid-template-columns: 320px 1fr;
       grid-template-rows: auto;
       grid-template-areas:
         "Action Main"
@@ -34,7 +181,6 @@
 
       &__main-col {
         grid-area: Main;
-        overflow: auto;
       }
 
       &__action-col {
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 90cec7f30..933351c97 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -4,30 +4,46 @@ import React, { useState, useEffect, useCallback } from "react"
 
 import { Comment, Post, Tag, Vote, CurrentUser, PostStatus } from "@fider/models"
 import { actions, cache, clearUrlHash, Failure, Fider, notify, timeAgo } from "@fider/services"
-import IconDotsHorizontal from "@fider/assets/images/heroicons-dots-horizontal.svg"
 import IconDuplicate from "@fider/assets/images/heroicons-duplicate.svg"
 import { i18n } from "@lingui/core"
 import IconRSS from "@fider/assets/images/heroicons-rss.svg"
 import IconPencil from "@fider/assets/images/heroicons-pencil-alt.svg"
 import IconChat from "@fider/assets/images/heroicons-chat-alt-2.svg"
 
-import { ResponseDetails, Button, UserName, Moment, Markdown, Input, Form, Icon, Header, PoweredByFider, Avatar, Dropdown, RSSModal } from "@fider/components"
-import { DiscussionPanel } from "./components/DiscussionPanel"
+import {
+  ResponseDetails,
+  Button,
+  UserName,
+  Moment,
+  Markdown,
+  Input,
+  Form,
+  Icon,
+  Header,
+  PoweredByFider,
+  Avatar,
+  RSSModal,
+  ResponseLozenge,
+} from "@fider/components"
+import { CommentInput } from "./components/CommentInput"
+import { ShowComment } from "./components/ShowComment"
+import { VoteSection } from "./components/VoteSection"
 import CommentEditor from "@fider/components/common/form/CommentEditor"
 
 import IconX from "@fider/assets/images/heroicons-x.svg"
 import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
+import IconTrash from "@fider/assets/images/heroicons-trash.svg"
 import { HStack, VStack } from "@fider/components/layout"
 import { Trans } from "@lingui/react/macro"
-import { FollowButton } from "./components/FollowButton"
-import { VoteSection } from "./components/VoteSection"
 import { DeletePostModal } from "./components/DeletePostModal"
 import { ResponseModal } from "./components/ResponseModal"
 import { VotesPanel } from "./components/VotesPanel"
 import { TagsPanel } from "@fider/pages/ShowPost/components/TagsPanel"
+import { ActionButton } from "./components/ActionButton"
 import { t } from "@lingui/macro"
 import { useFider } from "@fider/hooks"
 import { useAttachments } from "@fider/hooks/useAttachments"
+import { FollowButton } from "./components/FollowButton"
 
 interface ShowPostPageProps {
   post: Post
@@ -47,6 +63,19 @@ const canEditPost = (user: CurrentUser, post: Post) => {
   return user.id === post.user.id && timeAgo(post.createdAt) <= oneHour
 }
 
+const PostMetaInfo = ({ post, locale }: { post: Post; locale: string }) => (
+  <HStack spacing={2} align="center">
+    <Avatar user={post.user} size="small" />
+    <span className="text-sm text-gray-600">
+      <Trans id="showpost.postedby">Posted by</Trans> <UserName user={post.user} />
+    </span>
+    <span className="text-sm text-gray-400">•</span>
+    <Moment className="text-sm text-gray-600" locale={locale} date={post.createdAt} />
+    <span className="text-sm text-gray-400">•</span>
+    <ResponseLozenge status={post.status} response={post.response} size="xsmall" />
+  </HStack>
+)
+
 export default function ShowPostPage(props: ShowPostPageProps) {
   const [editMode, setEditMode] = useState(false)
   const [showDeleteModal, setShowDeleteModal] = useState(false)
@@ -160,144 +189,174 @@ export default function ShowPostPage(props: ShowPostPageProps) {
       <Header />
       <div id="p-show-post" className="page container">
         <div className="p-show-post">
+          {/* Left Sidebar */}
+          <div className="p-show-post__action-col">
+            <VotesPanel post={props.post} votes={props.votes} />
+
+            <PoweredByFider slot="show-post" className="mt-3" />
+          </div>
+
           <div className="p-show-post__main-col">
-            <div className="p-show-post__header-col">
-              <VStack spacing={8}>
-                <HStack justify="between">
-                  <VStack align="start">
-                    {!editMode && (
-                      <HStack>
-                        <Avatar user={props.post.user} />
-                        <VStack spacing={1}>
-                          <UserName user={props.post.user} />
-                          <Moment className="text-muted" locale={Fider.currentLocale} date={props.post.createdAt} />
-                        </VStack>
-                      </HStack>
-                    )}
-                  </VStack>
-                  <RSSModal isOpen={isRSSModalOpen} onClose={hideRSSModal} url={`${fider.settings.baseURL}/feed/posts/${props.post.number}.atom`} />
-
-                  {!editMode && (
-                    <HStack>
-                      <Dropdown position="left" renderHandle={<Icon sprite={IconDotsHorizontal} width="24" height="24" />}>
-                        <Dropdown.ListItem onClick={onActionSelected("copy")} icon={IconDuplicate}>
-                          <Trans id="action.copylink">Copy link</Trans>
-                        </Dropdown.ListItem>
-                        {Fider.session.tenant.isFeedEnabled && (
-                          <Dropdown.ListItem onClick={onActionSelected("feed")} icon={IconRSS}>
-                            <Trans id="action.commentsfeed">Comment Feed</Trans>
-                          </Dropdown.ListItem>
-                        )}
-                        {Fider.session.isAuthenticated && canEditPost(Fider.session.user, props.post) && (
-                          <>
-                            <Dropdown.ListItem onClick={onActionSelected("edit")} icon={IconPencil}>
-                              <Trans id="action.edit">Edit</Trans>
-                            </Dropdown.ListItem>
-                            {Fider.session.user.isCollaborator && (
-                              <Dropdown.ListItem onClick={onActionSelected("status")} icon={IconChat}>
-                                <Trans id="action.respond">Respond</Trans>
-                              </Dropdown.ListItem>
-                            )}
-                          </>
-                        )}
-                        {canDeletePost() && (
-                          <Dropdown.ListItem onClick={onActionSelected("delete")} className="text-red-700" icon={IconX}>
-                            <Trans id="action.delete">Delete</Trans>
-                          </Dropdown.ListItem>
-                        )}
-                      </Dropdown>
-                    </HStack>
-                  )}
-                </HStack>
+            {/* Post Card */}
+            <div className="p-show-post__post-card">
+              {/* Title and Meta */}
+              <VStack spacing={4}>
+                {/* Title */}
+                {editMode ? (
+                  <Form error={error}>
+                    <Input field="title" maxLength={100} value={newTitle} onChange={setNewTitle} />
+                  </Form>
+                ) : (
+                  <h1 className="p-show-post__title">{props.post.title}</h1>
+                )}
+
+                {/* Posted by info with status */}
+                {!editMode && (
+                  <>
+                    <div className="p-show-post__meta">
+                      <PostMetaInfo post={props.post} locale={fider.currentLocale} />
+                    </div>
+                    <ResponseDetails status={props.post.status} response={props.post.response} />
+                  </>
+                )}
+              </VStack>
 
-                <div className="flex-grow">
-                  {editMode ? (
-                    <Form error={error}>
-                      <Input field="title" maxLength={100} value={newTitle} onChange={setNewTitle} />
-                    </Form>
-                  ) : (
-                    <>
-                      <h1 className="text-large text-break">{props.post.title}</h1>
-                    </>
+              {/* Description - Full width */}
+              {!editMode ? (
+                <div className="p-show-post__description-section">
+                  {props.post.description && <Markdown className="p-show-post__description" text={props.post.description} style="full" />}
+                  {!props.post.description && (
+                    <em className="text-muted">
+                      <Trans id="showpost.message.nodescription">No description provided.</Trans>
+                    </em>
                   )}
                 </div>
+              ) : (
+                <div className="p-show-post__description-section">
+                  <Form error={error}>
+                    <CommentEditor
+                      field="description"
+                      onChange={handleDescriptionChange}
+                      initialValue={newDescription}
+                      disabled={false}
+                      maxAttachments={3}
+                      maxImageSizeKB={5 * 1024}
+                      placeholder={i18n._({
+                        id: "newpost.modal.description.placeholder",
+                        message: "Tell us about it. Explain it fully, don't hold back, the more information the better.",
+                      })}
+                      onImageUploaded={handleImageUploaded}
+                      onGetImageSrc={getImageSrc}
+                    />
+                  </Form>
+                </div>
+              )}
 
-                <DeletePostModal onModalClose={() => setShowDeleteModal(false)} showModal={showDeleteModal} post={props.post} />
-                {Fider.session.isAuthenticated && Fider.session.user.isCollaborator && (
-                  <ResponseModal onCloseModal={() => setShowResponseModal(false)} showModal={showResponseModal} post={props.post} />
-                )}
-                <VStack>
-                  {editMode ? (
-                    <Form error={error}>
-                      <CommentEditor
-                        field="description"
-                        onChange={handleDescriptionChange}
-                        initialValue={newDescription}
-                        disabled={false}
-                        maxAttachments={3}
-                        maxImageSizeKB={5 * 1024}
-                        placeholder={i18n._({
-                          id: "newpost.modal.description.placeholder",
-                          message: "Tell us about it. Explain it fully, don't hold back, the more information the better.",
-                        })}
-                        onImageUploaded={handleImageUploaded}
-                        onGetImageSrc={getImageSrc}
-                      />
-                    </Form>
-                  ) : (
-                    <>
-                      {props.post.description && <Markdown className="description" text={props.post.description} style="full" />}
-                      {!props.post.description && (
-                        <em className="text-muted">
-                          <Trans id="showpost.message.nodescription">No description provided.</Trans>
-                        </em>
-                      )}
-                    </>
-                  )}
-                </VStack>
-                <div className="mt-2">
+              {props.tags.length >= 1 && (
+                <div className="pt-7">
                   <TagsPanel post={props.post} tags={props.tags} />
                 </div>
+              )}
 
-                <VStack spacing={4}>
-                  {!editMode ? (
-                    <HStack justify="between" align="start">
-                      <VoteSection post={props.post} votes={props.post.votesCount} />
-                      <FollowButton post={props.post} subscribed={props.subscribed} />
-                    </HStack>
-                  ) : (
-                    <HStack>
-                      <Button variant="primary" onClick={saveChanges} disabled={Fider.isReadOnly}>
-                        <Icon sprite={IconThumbsUp} />{" "}
-                        <span>
-                          <Trans id="action.save">Save</Trans>
-                        </span>
-                      </Button>
-                      <Button onClick={cancelEdit} disabled={Fider.isReadOnly}>
-                        <Icon sprite={IconX} />
-                        <span>
-                          <Trans id="action.cancel">Cancel</Trans>
-                        </span>
-                      </Button>
-                    </HStack>
-                  )}
-                  <div className="border-4 border-blue-500" />
-                </VStack>
+              {/* Vote Section */}
+              {!editMode && (
+                <div className="p-show-post__vote-section">
+                  <VoteSection post={props.post} votes={props.post.votesCount} />
+                </div>
+              )}
 
-                <ResponseDetails status={props.post.status} response={props.post.response} />
-              </VStack>
+              {/* Edit Mode Actions */}
+              {editMode && (
+                <HStack className="mt-6">
+                  <Button variant="primary" onClick={saveChanges} disabled={Fider.isReadOnly}>
+                    <Icon sprite={IconThumbsUp} />{" "}
+                    <span>
+                      <Trans id="action.save">Save</Trans>
+                    </span>
+                  </Button>
+                  <Button onClick={cancelEdit} disabled={Fider.isReadOnly}>
+                    <Icon sprite={IconX} />
+                    <span>
+                      <Trans id="action.cancel">Cancel</Trans>
+                    </span>
+                  </Button>
+                </HStack>
+              )}
+
+              {/* Bottom Action Bar */}
+              {!editMode && (
+                <div className="p-show-post__actions">
+                  <HStack spacing={0} align="center" className="flex-wrap gap-2">
+                    <ActionButton icon={IconDuplicate} onClick={onActionSelected("copy")}>
+                      <Trans id="action.copylink">Copy link</Trans>
+                    </ActionButton>
+
+                    {Fider.session.isAuthenticated && canEditPost(Fider.session.user, props.post) && (
+                      <ActionButton icon={IconPencil} onClick={onActionSelected("edit")}>
+                        <Trans id="action.edit">Edit</Trans>
+                      </ActionButton>
+                    )}
+
+                    {Fider.session.isAuthenticated && Fider.session.user.isCollaborator && (
+                      <ActionButton icon={IconChat} onClick={onActionSelected("status")}>
+                        <Trans id="action.respond">Respond</Trans>
+                      </ActionButton>
+                    )}
+
+                    {Fider.session.tenant.isFeedEnabled && (
+                      <ActionButton icon={IconRSS} onClick={onActionSelected("feed")}>
+                        <Trans id="action.commentsfeed">Comment Feed</Trans>
+                      </ActionButton>
+                    )}
+
+                    {canDeletePost() && (
+                      <ActionButton icon={IconTrash} onClick={onActionSelected("delete")} variant="danger">
+                        <Trans id="action.delete">Delete</Trans>
+                      </ActionButton>
+                    )}
+
+                    <div className="flex-grow" />
+
+                    <FollowButton post={props.post} subscribed={props.subscribed} />
+                  </HStack>
+                </div>
+              )}
             </div>
 
-            <div className="p-show-post__discussion_col">
-              <DiscussionPanel post={props.post} comments={props.comments} highlightedComment={highlightedComment} />
+            {/* Discussion Section */}
+            <div className="p-show-post__discussion-section">
+              {/* Discussion Header */}
+              <HStack className="p-show-post__discussion-header" align="center" spacing={4}>
+                <h2 className="text-xl text-bold text-gray-900">
+                  <span className="text-bold">
+                    <Trans id="label.discussion">Discussion</Trans>
+                  </span>
+                </h2>
+                <div className="p-show-post__discussion-count">{props.comments.length}</div>
+              </HStack>
+
+              {/* Comment Input at top */}
+              <CommentInput post={props.post} />
+
+              {/* Comments List */}
+              {props.comments.length > 0 && (
+                <VStack spacing={4}>
+                  {props.comments.map((c) => (
+                    <ShowComment key={c.id} post={props.post} comment={c} highlighted={highlightedComment === c.id} />
+                  ))}
+                </VStack>
+              )}
             </div>
           </div>
-          <div className="p-show-post__action-col">
-            <VotesPanel post={props.post} votes={props.votes} />
-            <PoweredByFider slot="show-post" className="mt-3" />
-          </div>
         </div>
       </div>
+
+      {/* Modals */}
+      <RSSModal isOpen={isRSSModalOpen} onClose={hideRSSModal} url={`${fider.settings.baseURL}/feed/posts/${props.post.number}.atom`} />
+      <DeletePostModal onModalClose={() => setShowDeleteModal(false)} showModal={showDeleteModal} post={props.post} />
+      {Fider.session.isAuthenticated && Fider.session.user.isCollaborator && (
+        <ResponseModal onCloseModal={() => setShowResponseModal(false)} showModal={showResponseModal} post={props.post} />
+      )}
     </>
   )
 }
diff --git a/public/pages/ShowPost/components/ActionButton.scss b/public/pages/ShowPost/components/ActionButton.scss
new file mode 100644
index 000000000..6f26fa9c2
--- /dev/null
+++ b/public/pages/ShowPost/components/ActionButton.scss
@@ -0,0 +1,37 @@
+@use "~@fider/assets/styles/variables.scss" as *;
+
+.c-action-button {
+  display: inline-flex;
+  align-items: center;
+  padding: spacing(2) spacing(3);
+  border: none;
+  background-color: transparent;
+  border-radius: get("border.radius.medium");
+  color: var(--colors-gray-700);
+  font-size: get("font.size.sm");
+  font-weight: get("font.weight.medium");
+  cursor: pointer;
+  transition: background-color 0.2s ease-in-out;
+
+  &:hover {
+    background-color: var(--colors-gray-100);
+  }
+
+  &--danger {
+    color: var(--colors-red-700);
+
+    &:hover {
+      background-color: var(--colors-red-50);
+    }
+  }
+
+  &__icon {
+    width: 18px;
+    height: 18px;
+    flex-shrink: 0;
+  }
+
+  &__text {
+    white-space: nowrap;
+  }
+}
diff --git a/public/pages/ShowPost/components/ActionButton.tsx b/public/pages/ShowPost/components/ActionButton.tsx
new file mode 100644
index 000000000..a33b4518c
--- /dev/null
+++ b/public/pages/ShowPost/components/ActionButton.tsx
@@ -0,0 +1,27 @@
+import "./ActionButton.scss"
+
+import React from "react"
+import { Icon } from "@fider/components"
+import { HStack } from "@fider/components/layout"
+
+interface ActionButtonProps {
+  icon: SpriteSymbol | string
+  onClick: () => void
+  children: React.ReactNode
+  disabled?: boolean
+  variant?: "normal" | "danger"
+}
+
+export const ActionButton = (props: ActionButtonProps) => {
+  const { icon, onClick, children, variant = "normal" } = props
+  const className = `c-action-button ${variant === "danger" ? "c-action-button--danger" : ""}`
+
+  return (
+    <button className={className} onClick={onClick} disabled={props.disabled}>
+      <HStack spacing={2} align="center">
+        <Icon sprite={icon} className="c-action-button__icon" />
+        <span className="c-action-button__text">{children}</span>
+      </HStack>
+    </button>
+  )
+}
diff --git a/public/pages/ShowPost/components/CommentInput.tsx b/public/pages/ShowPost/components/CommentInput.tsx
index 3549bc945..7d8ae1cb2 100644
--- a/public/pages/ShowPost/components/CommentInput.tsx
+++ b/public/pages/ShowPost/components/CommentInput.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState, useEffect } from "react"
 
 import { Post } from "@fider/models"
-import { Avatar, UserName, Button, Form } from "@fider/components"
+import { Avatar, Button, Form } from "@fider/components"
 import { SignInModal } from "@fider/components"
 
 import { cache, actions, Failure, Fider } from "@fider/services"
@@ -76,16 +76,10 @@ export const CommentInput = (props: CommentInputProps) => {
   return (
     <>
       <SignInModal isOpen={isSignInModalOpen} onClose={hideModal} />
-      <HStack spacing={2} className="c-comment-input" align="start">
-        {Fider.session.isAuthenticated && <Avatar user={Fider.session.user} />}
-        <div className="flex-grow bg-gray-100 rounded-md p-2">
+      <HStack spacing={4} className="c-comment-input" align="start">
+        {Fider.session.isAuthenticated && <Avatar user={Fider.session.user} size="large" />}
+        <div className="c-comment-input-card">
           <Form error={error}>
-            {Fider.session.isAuthenticated && (
-              <div className="mb-1">
-                <UserName user={Fider.session.user} />
-              </div>
-            )}
-
             {isClient ? (
               <>
                 <CommentEditor
@@ -103,8 +97,8 @@ export const CommentInput = (props: CommentInputProps) => {
 
                 {hasContent && (
                   <>
-                    <Button variant="primary" onClick={submit} className="mt-2">
-                      <Trans id="action.submit">Submit</Trans>
+                    <Button variant="primary" onClick={submit} className="mt-4">
+                      <Trans id="action.postcomment">Post Comment</Trans>
                     </Button>
                   </>
                 )}
diff --git a/public/pages/ShowPost/components/FollowButton.tsx b/public/pages/ShowPost/components/FollowButton.tsx
index b596f666a..1bd3cf37f 100644
--- a/public/pages/ShowPost/components/FollowButton.tsx
+++ b/public/pages/ShowPost/components/FollowButton.tsx
@@ -1,12 +1,11 @@
 import React, { useState } from "react"
-import { Button, Icon } from "@fider/components"
 import { actions } from "@fider/services"
 import { useFider } from "@fider/hooks"
 import IconPlus from "@fider/assets/images/heroicons-plus.svg"
 import IconCheck from "@fider/assets/images/heroicons-check.svg"
-import { VStack } from "@fider/components/layout"
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { Post } from "@fider/models"
+import { ActionButton } from "./ActionButton"
 
 export interface NotificationsPanelProps {
   post: Post
@@ -30,21 +29,13 @@ export const FollowButton = (props: NotificationsPanelProps) => {
     return null
   }
 
-  const button = subscribed ? (
-    <Button className="w-full text-gray-800 bg-white border border-gray-800 no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
-      <Icon sprite={IconCheck} />{" "}
-      <span>
-        <Trans id="label.following">Following</Trans>
-      </span>
-    </Button>
+  return subscribed ? (
+    <ActionButton icon={IconCheck} onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
+      <Trans id="label.following">Following</Trans>
+    </ActionButton>
   ) : (
-    <Button className="w-full text-blue-600 bg-white border border-blue-600 no-focus" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
-      <Icon sprite={IconPlus} />
-      <span>
-        <Trans id="label.follow">Follow</Trans>
-      </span>
-    </Button>
+    <ActionButton icon={IconPlus} onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
+      <Trans id="label.follow">Follow</Trans>
+    </ActionButton>
   )
-
-  return <VStack>{button}</VStack>
 }
diff --git a/public/pages/ShowPost/components/ShowComment.scss b/public/pages/ShowPost/components/ShowComment.scss
index 4cbbfb543..dd8d6e946 100644
--- a/public/pages/ShowPost/components/ShowComment.scss
+++ b/public/pages/ShowPost/components/ShowComment.scss
@@ -1,6 +1,24 @@
 @use "~@fider/assets/styles/variables.scss" as *;
 
-.comment-area {
-    // spacing(8) for the avatar + spacing(1) for padding right
-    width: calc(100% - spacing(9));
+.c-comment {
+  &__card {
+    flex-grow: 1;
+    background-color: var(--colors-white);
+    @include dark-mode {
+      background-color: var(--colors-gray-200);
+    }
+    border-radius: get("border.radius.xlarge");
+    padding: spacing(6);
+    box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+  }
+
+  &__content {
+    flex-grow: 1;
+
+    &--highlighted {
+      padding: spacing(2);
+      background-color: var(--colors-yellow-50);
+      border-radius: get("border.radius.medium");
+    }
+  }
 }
diff --git a/public/pages/ShowPost/components/ShowComment.tsx b/public/pages/ShowPost/components/ShowComment.tsx
index fb090f084..c4fa6f539 100644
--- a/public/pages/ShowPost/components/ShowComment.tsx
+++ b/public/pages/ShowPost/components/ShowComment.tsx
@@ -158,25 +158,22 @@ export const ShowComment = (props: ShowCommentProps) => {
   )
 
   const classList = classSet({
-    "flex-grow rounded-md p-2 comment-area": true,
-    "bg-gray-100": !props.highlighted,
-    "bg-gray-200": props.highlighted,
+    "c-comment__content": true,
+    "c-comment__content--highlighted": props.highlighted,
   })
 
   return (
     <div id={`comment-${comment.id}`}>
-      <HStack spacing={2} className="c-comment flex-items-baseline">
-        {modal()}
-        <div className="pt-4">
-          <Avatar user={comment.user} />
-        </div>
-        <div ref={node} className={classList}>
+      {modal()}
+      <HStack spacing={4} align="start">
+        <Avatar user={comment.user} size="large" />
+        <div ref={node} className={`c-comment__card ${classList}`}>
           <div className="mb-1">
             <HStack justify="between">
               <HStack>
-                <UserName user={comment.user} />{" "}
+                <UserName user={comment.user} /> <span className="text-sm text-gray-400">•</span>
                 <div className="text-xs">
-                  · <Moment locale={fider.currentLocale} date={comment.createdAt} /> {editedMetadata}
+                  <Moment locale={fider.currentLocale} date={comment.createdAt} /> {editedMetadata}
                 </div>
               </HStack>
               {!isEditing && (
diff --git a/public/pages/ShowPost/components/VoteSection.tsx b/public/pages/ShowPost/components/VoteSection.tsx
index b517ab492..65093d4e9 100644
--- a/public/pages/ShowPost/components/VoteSection.tsx
+++ b/public/pages/ShowPost/components/VoteSection.tsx
@@ -5,7 +5,7 @@ import { Button, Icon, SignInModal } from "@fider/components"
 import { useFider } from "@fider/hooks"
 import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
 import IconCheck from "@fider/assets/images/heroicons-check.svg"
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 import { HStack, VStack } from "@fider/components/layout"
 
 interface VoteSectionProps {
@@ -25,10 +25,11 @@ export const VoteSection = (props: VoteSectionProps) => {
       return
     }
 
-    const response = await actions.toggleVote(props.post.number)
+    const action = hasVoted ? actions.removeVote : actions.addVote
+    const response = await action(props.post.number)
     if (response.ok) {
-      setVotes(response.data.voted ? votes + 1 : votes - 1)
-      setHasVoted(response.data.voted)
+      setVotes(hasVoted ? votes - 1 : votes + 1)
+      setHasVoted(!hasVoted)
     }
   }
 
@@ -41,21 +42,23 @@ export const VoteSection = (props: VoteSectionProps) => {
   const icon = hasVoted ? IconCheck : IconThumbsUp
 
   return (
-    <VStack spacing={4}>
+    <>
       <SignInModal isOpen={isSignInModalOpen} onClose={hideModal} />
-      <div className="align-self-start">
-        <Button variant="primary" onClick={voteOrUndo} disabled={isDisabled} style={{ minWidth: "180px" }}>
-          <HStack spacing={2} justify="center" className="w-full">
-            <Icon sprite={icon} /> <span>{buttonText}</span>
-          </HStack>
-        </Button>
-      </div>
-      <HStack align="center">
-        <span className="text-semibold text-2xl" style={{ fontSize: "32px", minHeight: "48px" }}>
-          {votes}
-        </span>
-        <span className="text-semibold text-lg">{votes === 1 ? "Vote" : "Votes"}</span>
-      </HStack>
-    </VStack>
+      <VStack spacing={4}>
+        <div className="align-self-start">
+          <Button variant="primary" onClick={voteOrUndo} disabled={isDisabled} style={{ minWidth: "180px" }}>
+            <HStack spacing={2} justify="center" className="w-full">
+              <Icon sprite={icon} /> <span>{buttonText}</span>
+            </HStack>
+          </Button>
+        </div>
+        <HStack align="center" spacing={2}>
+          <span className="text-semibold text-2xl" style={{ fontSize: "32px", minHeight: "48px" }}>
+            {votes}
+          </span>
+          <span className="text-semibold text-lg">{votes === 1 ? <Trans id="label.vote">Vote</Trans> : <Trans id="label.votes">Votes</Trans>}</span>
+        </HStack>
+      </VStack>
+    </>
   )
 }
diff --git a/public/pages/ShowPost/components/VotesModal.scss b/public/pages/ShowPost/components/VotesModal.scss
new file mode 100644
index 000000000..cb00088a8
--- /dev/null
+++ b/public/pages/ShowPost/components/VotesModal.scss
@@ -0,0 +1,21 @@
+@use "~@fider/assets/styles/variables.scss" as *;
+
+.c-votes-modal {
+  &__list {
+    margin-top: spacing(4);
+  }
+
+  &__item {
+    padding: spacing(4);
+    transition: background-color 0.15s ease;
+
+    &--alternate {
+      background-color: var(--colors-gray-50);
+    }
+  }
+
+  &__date {
+    padding-right: spacing(4);
+    flex-shrink: 0;
+  }
+}
diff --git a/public/pages/ShowPost/components/VotesModal.tsx b/public/pages/ShowPost/components/VotesModal.tsx
index 2ce92b7c7..f34b046e0 100644
--- a/public/pages/ShowPost/components/VotesModal.tsx
+++ b/public/pages/ShowPost/components/VotesModal.tsx
@@ -1,7 +1,9 @@
+import "./VotesModal.scss"
+
 import React, { useEffect, useState } from "react"
 import { Post, Vote } from "@fider/models"
 import { Modal, Button, Loader, Avatar, UserName, Moment, Input } from "@fider/components"
-import { actions } from "@fider/services"
+import { actions, classSet } from "@fider/services"
 import { useFider } from "@fider/hooks"
 import IconSearch from "@fider/assets/images/heroicons-search.svg"
 import IconX from "@fider/assets/images/heroicons-x.svg"
@@ -65,17 +67,24 @@ export const VotesModal: React.FC<VotesModalProps> = (props) => {
               value={query}
               onChange={handleSearchFilterChanged}
             />
-            <VStack spacing={2} className="h-max-5xl overflow-auto">
-              {filteredVotes.map((x) => (
-                <HStack key={x.user.id} justify="between">
-                  <HStack>
+            <VStack spacing={0} className="h-max-5xl overflow-auto c-votes-modal__list">
+              {filteredVotes.map((x, index) => (
+                <HStack
+                  key={x.user.id}
+                  justify="between"
+                  className={classSet({
+                    "c-votes-modal__item": true,
+                    "c-votes-modal__item--alternate": index % 2 === 1,
+                  })}
+                >
+                  <HStack spacing={4}>
                     <Avatar user={x.user} />
-                    <VStack spacing={0}>
+                    <VStack spacing={1}>
                       <UserName user={x.user} />
-                      <span className="text-muted">{x.user.email}</span>
+                      <span className="text-muted text-sm">{x.user.email}</span>
                     </VStack>
                   </HStack>
-                  <span className="text-muted">
+                  <span className="text-muted text-sm c-votes-modal__date">
                     <Moment locale={fider.currentLocale} date={x.createdAt} />
                   </span>
                 </HStack>
diff --git a/public/pages/ShowPost/components/VotesPanel.scss b/public/pages/ShowPost/components/VotesPanel.scss
new file mode 100644
index 000000000..e9aec1624
--- /dev/null
+++ b/public/pages/ShowPost/components/VotesPanel.scss
@@ -0,0 +1,72 @@
+@use "~@fider/assets/styles/variables.scss" as *;
+
+.c-votes-panel {
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  &__count-badge {
+    background-color: var(--colors-gray-100);
+    color: var(--colors-gray-700);
+    font-size: get("font.size.xs");
+    font-weight: get("font.weight.semibold");
+    padding: spacing(1) spacing(2);
+    border-radius: get("border.radius.full");
+    line-height: 1;
+  }
+
+  &__avatars {
+    display: flex;
+    flex-wrap: wrap;
+    gap: spacing(3);
+    align-items: center;
+
+    // Style avatars with border
+    .c-avatar {
+      border: 2px solid var(--colors-white);
+      box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+    }
+  }
+
+  &__more-avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: get("border.radius.full");
+    border: 2px dashed var(--colors-gray-300);
+    background-color: var(--colors-white);
+    color: var(--colors-gray-600);
+    font-size: get("font.size.sm");
+    font-weight: get("font.weight.semibold");
+    cursor: pointer;
+    transition: all 0.2s ease;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+
+    @include dark-mode {
+      border: 2px dashed var(--colors-gray-600);
+      background-color: var(--colors-gray-200);
+      color: var(--colors-gray-600);
+    }
+
+    svg {
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover:not(:disabled) {
+      border-color: var(--colors-primary-base);
+      color: var(--colors-primary-base);
+      background-color: var(--colors-primary-50);
+      transform: scale(1.05);
+    }
+
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.6;
+    }
+  }
+}
diff --git a/public/pages/ShowPost/components/VotesPanel.tsx b/public/pages/ShowPost/components/VotesPanel.tsx
index ff0a8d968..11d88606c 100644
--- a/public/pages/ShowPost/components/VotesPanel.tsx
+++ b/public/pages/ShowPost/components/VotesPanel.tsx
@@ -1,11 +1,14 @@
+import "./VotesPanel.scss"
+
 import React, { useState } from "react"
 import { Post, Vote } from "@fider/models"
-import { AvatarStack, Button } from "@fider/components"
+import { Avatar, Icon } from "@fider/components"
 import { Fider } from "@fider/services"
 import { useFider } from "@fider/hooks"
 import { VotesModal } from "./VotesModal"
-import { HStack, VStack } from "@fider/components/layout"
+import { VStack } from "@fider/components/layout"
 import { Trans } from "@lingui/react/macro"
+import IconPerson from "@fider/assets/images/heroicons-person.svg"
 
 interface VotesPanelProps {
   post: Post
@@ -13,6 +16,8 @@ interface VotesPanelProps {
   votes: Vote[]
 }
 
+const MAX_AVATARS_SHOWN = 12
+
 export const VotesPanel = (props: VotesPanelProps) => {
   const fider = useFider()
   const [isVotesModalOpen, setIsVotesModalOpen] = useState(false)
@@ -26,31 +31,40 @@ export const VotesPanel = (props: VotesPanelProps) => {
 
   const closeModal = () => setIsVotesModalOpen(false)
 
-  const extraVotesCount = props.post.votesCount - props.votes.length
+  const totalVotesCount = props.post.votesCount
+  const visibleVotes = props.votes.slice(0, MAX_AVATARS_SHOWN)
+  const remainingCount = totalVotesCount - MAX_AVATARS_SHOWN
 
   return (
-    <VStack spacing={4}>
+    <VStack spacing={4} className="c-votes-panel card">
       <VotesModal post={props.post} isOpen={isVotesModalOpen} onClose={closeModal} />
-      {!props.hideTitle && (
-        <span className="text-category">
-          <Trans id="label.voters">Voters</Trans>
-        </span>
-      )}
+
+      <div className="c-votes-panel__header">
+        {!props.hideTitle && (
+          <span className="text-bold text-gray-900">
+            <Trans id="label.voters">Voters</Trans>
+          </span>
+        )}
+        <div className="c-votes-panel__count-badge">{totalVotesCount}</div>
+      </div>
+
       {props.votes.length > 0 && (
-        <HStack spacing={0} className="gap-2">
-          <AvatarStack users={props.votes.map((x) => x.user)} overlap={false} />
-        </HStack>
-      )}
-      {extraVotesCount > 0 && (
-        <Button variant="tertiary" disabled={!canShowAll} size="small" onClick={openModal}>
-          <Trans id="showpost.votespanel.more">+{extraVotesCount} more</Trans>
-        </Button>
-      )}
-      {props.votes.length > 0 && extraVotesCount === 0 && canShowAll && (
-        <Button variant="tertiary" size="small" disabled={!canShowAll} onClick={openModal}>
-          <Trans id="showpost.votespanel.seedetails">see details</Trans>
-        </Button>
+        <div className="c-votes-panel__avatars">
+          {visibleVotes.map((vote, i) => (
+            <Avatar key={i} user={vote.user} />
+          ))}
+          {remainingCount > 0 ? (
+            <button className="c-votes-panel__more-avatar" onClick={openModal} disabled={!canShowAll}>
+              +{remainingCount}
+            </button>
+          ) : (
+            <button className="c-votes-panel__more-avatar" onClick={openModal} disabled={!canShowAll}>
+              <Icon sprite={IconPerson} />
+            </button>
+          )}
+        </div>
       )}
+
       {props.votes.length === 0 && (
         <span className="text-muted">
           <Trans id="label.none">None</Trans>
diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.ts
index 58e5d62d9..9b66d23d3 100644
--- a/public/services/actions/tenant.ts
+++ b/public/services/actions/tenant.ts
@@ -28,6 +28,7 @@ export interface UpdateTenantSettingsRequest {
   title: string
   invitation: string
   welcomeMessage: string
+  welcomeHeader: string
   cname: string
   locale: string
 }