diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index ba12b7ff12..ff21613586 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1040,7 +1040,7 @@ PATH =
 ;; Additional Emojis not defined in the utf8 standard
 ;; By default we support gitea (:gitea:), to add more copy them to public/img/emoji/emoji_name.png and add it to this config.
 ;; Dont mistake it for Reactions.
-;CUSTOM_EMOJIS = gitea
+;CUSTOM_EMOJIS = gitea, codeberg, gitlab, git, github, gogs
 ;;
 ;; Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 ;DEFAULT_SHOW_FULL_NAME = false
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
index f95a96439f..67b3754816 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -181,7 +181,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `REACTIONS`: All available reactions users can choose on issues/prs and comments
     Values can be emoji alias (:smile:) or a unicode emoji.
     For custom reactions, add a tightly cropped square image to public/img/emoji/reaction_name.png
-- `CUSTOM_EMOJIS`: **gitea**: Additional Emojis not defined in the utf8 standard.
+- `CUSTOM_EMOJIS`: **gitea, codeberg, gitlab, git, github, gogs**: Additional Emojis not defined in the utf8 standard.
     By default we support gitea (:gitea:), to add more copy them to public/img/emoji/emoji_name.png and
     add it to this config.
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
@@ -392,7 +392,7 @@ relation to port exhaustion.
 - `MAX_ATTEMPTS`: **10**: Maximum number of attempts to create the wrapped queue
 - `TIMEOUT`: **GRACEFUL_HAMMER_TIME + 30s**: Timeout the creation of the wrapped queue if it takes longer than this to create.
 - Queues by default come with a dynamically scaling worker pool. The following settings configure this:
-- `WORKERS`: **0** (v1.14 and before: **1**): Number of initial workers for the queue. 
+- `WORKERS`: **0** (v1.14 and before: **1**): Number of initial workers for the queue.
 - `MAX_WORKERS`: **10**: Maximum number of worker go-routines for the queue.
 - `BLOCK_TIMEOUT`: **1s**: If the queue blocks for this time, boost the number of workers - the `BLOCK_TIMEOUT` will then be doubled before boosting again whilst the boost is ongoing.
 - `BOOST_TIMEOUT`: **5m**: Boost workers will timeout after this long.
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index e37b788342..e3da5796e4 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -258,8 +258,8 @@ var (
 		DefaultTheme:        `gitea`,
 		Themes:              []string{`gitea`, `arc-green`},
 		Reactions:           []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
-		CustomEmojis:        []string{`gitea`},
-		CustomEmojisMap:     map[string]string{"gitea": ":gitea:"},
+		CustomEmojis:        []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`},
+		CustomEmojisMap:     map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:"},
 		Notification: struct {
 			MinTimeout            time.Duration
 			TimeoutStep           time.Duration
diff --git a/public/img/emoji/codeberg.png b/public/img/emoji/codeberg.png
new file mode 100644
index 0000000000..b91613833a
Binary files /dev/null and b/public/img/emoji/codeberg.png differ
diff --git a/public/img/emoji/git.png b/public/img/emoji/git.png
new file mode 100644
index 0000000000..00a6bcfca4
Binary files /dev/null and b/public/img/emoji/git.png differ
diff --git a/public/img/emoji/github.png b/public/img/emoji/github.png
new file mode 100644
index 0000000000..88efc353e7
Binary files /dev/null and b/public/img/emoji/github.png differ
diff --git a/public/img/emoji/gitlab.png b/public/img/emoji/gitlab.png
new file mode 100644
index 0000000000..55a0d2b70b
Binary files /dev/null and b/public/img/emoji/gitlab.png differ
diff --git a/public/img/emoji/gogs.png b/public/img/emoji/gogs.png
new file mode 100644
index 0000000000..6471a84dad
Binary files /dev/null and b/public/img/emoji/gogs.png differ