diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm
index c4237cbcc88..eac63b927a3 100644
--- a/code/_helpers/text.dm
+++ b/code/_helpers/text.dm
@@ -453,9 +453,18 @@ proc/TextPreview(var/string,var/len=40)
t = replacetext(t, "\[logo_zh\]", "
")
t = replacetext(t, "\[logo_idris\]", "
")
t = replacetext(t, "\[logo_eridani\]", "
")
- t = replacetext(t, "\[logo_zavodskoi\]", "
")
+ t = replacetext(t, "\[logo_zavod\]", "
")
t = replacetext(t, "\[logo_hp\]", "
")
- t = replacetext(t, "\[logo_be\]", "
")
+ t = replacetext(t, "\[flag_be\]", "
")
+ t = replacetext(t, "\[flag_elyra\]", "
")
+ t = replacetext(t, "\[flag_sol\]", "
")
+ t = replacetext(t, "\[flag_coc\]", "
")
+ t = replacetext(t, "\[flag_dom\]", "
")
+ t = replacetext(t, "\[flag_jargon\]", "
")
+ t = replacetext(t, "\[flag_pra\]", "
")
+ t = replacetext(t, "\[flag_dpra\]", "
")
+ t = replacetext(t, "\[flag_nka\]", "
")
+ t = replacetext(t, "\[flag_izweski\]", "
")
t = replacetext(t, "\[barcode\]", "
")
t = replacetext(t, "\[time\]", "[worldtime2text()]")
t = replacetext(t, "\[date\]", "[worlddate2text()]")
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index 34614008da3..94b0d935918 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -191,7 +191,16 @@ var/list/asset_datums = list()
"eridanilogo.png" = 'html/images/eridanilogo.png',
"zavodlogo.png" = 'html/images/zavodlogo.png',
"hplogo.png" = 'html/images/hplogo.png',
- "belogo.png" = 'html/images/belogo.png'
+ "beflag.png" = 'html/images/beflag.png',
+ "elyraflag.png" = 'html/images/elyraflag.png',
+ "solflag.png" = 'html/images/solflag.png',
+ "cocflag.png" = 'html/images/cocflag.png',
+ "domflag.png" = 'html/images/domflag.png',
+ "jargonflag.png" = 'html/images/jargonflag.png',
+ "praflag.png" = 'html/images/praflag.png',
+ "dpraflag.png" = 'html/images/dpraflag.png',
+ "nkaflag.png" = 'html/images/nkaflag.png',
+ "izweskiflag.png" = 'html/images/izweskiflag.png'
)
/datum/asset/simple/changelog
diff --git a/html/changelogs/Aboshehab - Nation Logos.yml b/html/changelogs/Aboshehab - Nation Logos.yml
new file mode 100644
index 00000000000..9da88148a4c
--- /dev/null
+++ b/html/changelogs/Aboshehab - Nation Logos.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Aboshehab
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Entering [logo_zavod] will now place the zavod logo when written on a paper."
+ - tweak: "Changed the prefix of nation flags from [logo_x] to [flag_x] to place a divide between the entities."
+ - rscadd: "Added or changed a number of flags that can be placed on paper for nations. [flag_be] for Biesel, [flag_sol] for Sol, [flag_elyra] for Elyra, [flag_coc] for the Coalition, [flag_dom] for Dominia, [flag_jargon] for Jargon, [flag_pra] for PRA, [flag_dpra] for DPRA, [flag_nka] for NKA and [flag_izweski] for Hegemony."
diff --git a/html/images/beflag.png b/html/images/beflag.png
new file mode 100644
index 00000000000..0cf2f7e31d2
Binary files /dev/null and b/html/images/beflag.png differ
diff --git a/html/images/belogo.png b/html/images/belogo.png
deleted file mode 100644
index bec0e234c64..00000000000
Binary files a/html/images/belogo.png and /dev/null differ
diff --git a/html/images/cocflag.png b/html/images/cocflag.png
new file mode 100644
index 00000000000..70bd8517dac
Binary files /dev/null and b/html/images/cocflag.png differ
diff --git a/html/images/domflag.png b/html/images/domflag.png
new file mode 100644
index 00000000000..c91f65934bf
Binary files /dev/null and b/html/images/domflag.png differ
diff --git a/html/images/dpraflag.png b/html/images/dpraflag.png
new file mode 100644
index 00000000000..d0a94ba9843
Binary files /dev/null and b/html/images/dpraflag.png differ
diff --git a/html/images/elyraflag.png b/html/images/elyraflag.png
new file mode 100644
index 00000000000..02634362441
Binary files /dev/null and b/html/images/elyraflag.png differ
diff --git a/html/images/izweskiflag.png b/html/images/izweskiflag.png
new file mode 100644
index 00000000000..d1493b4dfd4
Binary files /dev/null and b/html/images/izweskiflag.png differ
diff --git a/html/images/jargonflag.png b/html/images/jargonflag.png
new file mode 100644
index 00000000000..9248606f54a
Binary files /dev/null and b/html/images/jargonflag.png differ
diff --git a/html/images/nkaflag.png b/html/images/nkaflag.png
new file mode 100644
index 00000000000..03804ae5044
Binary files /dev/null and b/html/images/nkaflag.png differ
diff --git a/html/images/praflag.png b/html/images/praflag.png
new file mode 100644
index 00000000000..543b4004916
Binary files /dev/null and b/html/images/praflag.png differ
diff --git a/html/images/solflag.png b/html/images/solflag.png
new file mode 100644
index 00000000000..1b1b3ce1052
Binary files /dev/null and b/html/images/solflag.png differ