diff --git a/includes/types/currency.class.php b/includes/types/currency.class.php
index e1a3ba8b..dad04c36 100644
--- a/includes/types/currency.class.php
+++ b/includes/types/currency.class.php
@@ -51,9 +51,9 @@ class CurrencyList extends BaseType
         {
             // todo (low): find out, why i did this in the first place
             if ($this->id == 104)                           // in case of honor commit sebbuku
-                $icon = ['inv_bannerpvp_02', 'inv_bannerpvp_01']; // ['alliance', 'horde'];
+                $icon = ['pvp-currency-alliance', 'pvp-currency-horde'];
             else if ($this->id == 103)                      // also arena-icon diffs from item-icon
-                $icon = ['money_arena', 'money_arena'];
+                $icon = ['pvp-arenapoints-icon', 'pvp-arenapoints-icon'];
             else
                 $icon = [$this->curTpl['iconString'], $this->curTpl['iconString']];
 
diff --git a/pages/currency.php b/pages/currency.php
index 34810b9a..4e8699be 100644
--- a/pages/currency.php
+++ b/pages/currency.php
@@ -75,9 +75,13 @@ class CurrencyPage extends GenericPage
         /* Main Content */
         /****************/
 
+        $hi = $this->subject->getJSGlobals()[Type::CURRENCY][$this->typeId]['icon'];
+        if ($hi[0] == $hi[1])
+            unset($hi[1]);
+
         $this->infobox    = $infobox ? '[ul][li]'.implode('[/li][li]', $infobox).'[/li][/ul]' : null;
         $this->name       = $this->subject->getField('name', true);
-        $this->headIcons  = $this->typeId == 104 ? ['inv_bannerpvp_02', 'inv_bannerpvp_01'] : [$this->subject->getField('iconString')];
+        $this->headIcons  = $hi;
         $this->redButtons = array(
             BUTTON_WOWHEAD => true,
             BUTTON_LINKS   => true
diff --git a/setup/db_structure.sql b/setup/db_structure.sql
index c7eb3bb2..071f1904 100644
--- a/setup/db_structure.sql
+++ b/setup/db_structure.sql
@@ -3185,7 +3185,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `aowow_dbversion` WRITE;
 /*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */;
-INSERT INTO `aowow_dbversion` VALUES (1680717297,0,NULL,NULL);
+INSERT INTO `aowow_dbversion` VALUES (1682012751,0,NULL,NULL);
 /*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/setup/tools/filegen/simpleImg.func.php b/setup/tools/filegen/simpleImg.func.php
index dac42edf..e2adc05b 100644
--- a/setup/tools/filegen/simpleImg.func.php
+++ b/setup/tools/filegen/simpleImg.func.php
@@ -64,18 +64,19 @@ if (!CLI)
             ['loadingscreens/small/',    '.jpg', 0,  244, 0]
         );
         $paths    = array(                                  // src, [dest, ext, srcSize, destSize, borderOffset], pattern, isIcon, tileSize, resourcePath
-             0 => ['Icons/',                                                $iconDirs,                                        '/.*\.blp$',                         true,   0, null],
-             1 => ['Spellbook/',                                            [['Interface/Spellbook/',     '.png', 0,  0, 0]], '/UI-Glyph-Rune-?\d+.blp$',          true,   0, null],
-             2 => ['PaperDoll/',                                            array_slice($iconDirs, 0, 3),                     '/UI-(Backpack|PaperDoll)-.*\.blp$', true,   0, null],
-             3 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-Races.blp',    $iconDirs,                                        '',                                  true,  64, null],
-             4 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-CLASSES.blp',  $iconDirs,                                        '',                                  true,  64, null],
-             5 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-Factions.blp', $iconDirs,                                        '',                                  true,  64, null],
-          // 6 => ['Minimap/OBJECTICONS.BLP',                               [['icons/tiny/',              '.gif', 0, 16, 2]], '',                                  true,  32, null],
-             7 => ['FlavorImages/',                                         [['Interface/FlavorImages/',  '.png', 0,  0, 0]], '/.*\.blp$',                         false,  0, null],
-             8 => ['Pictures/',                                             [['Interface/Pictures/',      '.png', 0,  0, 0]], '/.*\.blp$',                         false,  0, null],
-             9 => ['PvPRankBadges/',                                        [['Interface/PvPRankBadges/', '.png', 0,  0, 0]], '/.*\.blp$',                         false,  0, null],
-            10 => ['Calendar/Holidays/',                                    $calendarDirs,                                    '/.*(start|[ayhs])\.blp$',           true,   0, null],
-            11 => ['GLUES/LOADINGSCREENS/',                                 $loadScreenDirs,                                  '/lo.*\.blp$',                       false,  0, null]
+             0 => ['Icons/',                                                $iconDirs,                                                    '/.*\.blp$',                           true,   0, null],
+             1 => ['Spellbook/',                                            [['Interface/Spellbook/',     '.png', 0,  0, 0]],             '/UI-Glyph-Rune-?\d+.blp$',            true,   0, null],
+             2 => ['PaperDoll/',                                            array_slice($iconDirs, 0, 3),                                 '/UI-(Backpack|PaperDoll)-.*\.blp$',   true,   0, null],
+             3 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-Races.blp',    $iconDirs,                                                    '',                                    true,  64, null],
+             4 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-CLASSES.blp',  $iconDirs,                                                    '',                                    true,  64, null],
+             5 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-Factions.blp', $iconDirs,                                                    '',                                    true,  64, null],
+          // 6 => ['Minimap/OBJECTICONS.BLP',                               [['icons/tiny/',              '.gif', 0, 16, 2]],             '',                                    true,  32, null],
+             7 => ['FlavorImages/',                                         [['Interface/FlavorImages/',  '.png', 0,  0, 0]],             '/.*\.blp$',                           false,  0, null],
+             8 => ['Pictures/',                                             [['Interface/Pictures/',      '.png', 0,  0, 0]],             '/.*\.blp$',                           false,  0, null],
+             9 => ['PvPRankBadges/',                                        [['Interface/PvPRankBadges/', '.png', 0,  0, 0]],             '/.*\.blp$',                           false,  0, null],
+            10 => ['Calendar/Holidays/',                                    $calendarDirs,                                                '/.*(start|[ayhs])\.blp$',             true,   0, null],
+            11 => ['GLUES/LOADINGSCREENS/',                                 $loadScreenDirs,                                              '/lo.*\.blp$',                         false,  0, null],
+            12 => ['PVPFrame/',                                             array_map(function($x) { $x[4] = 2; return $x; }, $iconDirs), '/PVP-(ArenaPoints|Currency).*\.blp$', true,   0, null]
         );
         // textures are composed of 64x64 icons
         // numeric indexed arrays mimick the position on the texture
@@ -197,7 +198,7 @@ if (!CLI)
         };
 
         if (CLISetup::getOpt('icons'))
-            array_push($groups, 0, 2, 3, 4, 5, 10);
+            array_push($groups, 0, 2, 3, 4, 5, 10, 12);
         if (CLISetup::getOpt('glyphs'))
             $groups[] = 1;
         if (CLISetup::getOpt('pagetexts'))
diff --git a/setup/updates/1682012750_01.sql b/setup/updates/1682012750_01.sql
new file mode 100644
index 00000000..1f28e1bf
--- /dev/null
+++ b/setup/updates/1682012750_01.sql
@@ -0,0 +1 @@
+UPDATE `aowow_dbversion` SET `build` = CONCAT(IFNULL(`build`, ''), ' simpleImg');