diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 68bec6862f..db378286ea 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -237,11 +237,11 @@ void GameSettingsScreen::CreateTabs() {
 		CreateNetworkingSettings(parent);
 	});
 
-	AddTab("GameSettingsTools", ms->T("Tools"), ImageID("I_DEVMENU"), [this](UI::LinearLayout *parent) {
+	AddTab("GameSettingsTools", ms->T("Tools"), ImageID("I_TOOLS"), [this](UI::LinearLayout *parent) {
 		CreateToolsSettings(parent);
 	});
 
-	AddTab("GameSettingsSystem", ms->T("System"), ImageID("I_GEAR"), [this](UI::LinearLayout *parent) {
+	AddTab("GameSettingsSystem", ms->T("System"), ImageID("I_PSP"), [this](UI::LinearLayout *parent) {
 		parent->SetSpacing(0);
 		CreateSystemSettings(parent);
 	});
diff --git a/UI/UIAtlas.cpp b/UI/UIAtlas.cpp
index dc4f631759..9bd97c467d 100644
--- a/UI/UIAtlas.cpp
+++ b/UI/UIAtlas.cpp
@@ -153,6 +153,8 @@ static const ImageMeta imageIDs[] = {
 	{"I_DEVMENU", false},
 	{"I_CONTROLLER", false},
 	{"I_DEBUGGER", false},
+	{"I_TOOLS", false},
+	{"I_PSP", false},
 };
 
 static std::string PNGNameFromID(std::string_view id) {
diff --git a/assets/ui_images/images.svg b/assets/ui_images/images.svg
index f778fc3f75..9e7d5d3dc2 100644
--- a/assets/ui_images/images.svg
+++ b/assets/ui_images/images.svg
@@ -24,15 +24,15 @@
      inkscape:pagecheckerboard="true"
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="px"
-     inkscape:zoom="4.0000002"
-     inkscape:cx="95.374995"
-     inkscape:cy="277.37499"
+     inkscape:zoom="2.0000001"
+     inkscape:cx="433.74998"
+     inkscape:cy="317.24998"
      inkscape:window-width="3379"
      inkscape:window-height="1941"
      inkscape:window-x="-9"
      inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="I_FOLDER_PINNED"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
      showgrid="false" /><defs
      id="defs1"><inkscape:path-effect
    effect="fillet_chamfer"
@@ -4278,7 +4278,21 @@
        d="m 18,14 c 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 0.5523,0 1,0.4477 1,1 z"
        fill="#1c274c"
        id="path5-9"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></g></g></g><path
+       style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></g></g><g
+   style="fill:#ffffff;stroke:none;fill-opacity:1"
+   id="I_TOOLS"
+   transform="matrix(0.40312873,0,0,0.40312873,94.498775,96.901751)"><path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 22.053129,4.0028661 c -1.68654,-0.04273 -3.38675,0.5794244 -4.673749,1.8664231 -2.255997,2.2559978 -2.447584,5.7721538 -0.616586,8.2681518 L 14.889962,15.705185 8.4523405,9.2419259 8.4267028,7.274234 4.601561,4.9335139 2.7300104,6.8076283 l 2.3266194,3.7405377 2.0099941,0.0013 6.3632721,6.379936 -9.5820827,8.025876 c -0.7669993,0.765999 -0.7669993,2.008279 0,2.775278 l 0.6947811,0.694782 c 0.7659992,0.766999 2.0082795,0.766999 2.7752788,0 l 8.4117228,-9.189827 1.195998,1.199844 -0.685808,0.684526 c -0.384,0.382999 -0.384,1.005281 0,1.38828 l 6.082539,6.14407 c 0.383,0.384 1.005281,0.384 1.38828,0 l 2.775279,-2.776561 c 0.384,-0.382999 0.384,-1.00528 0,-1.38828 l -6.081257,-6.142788 c -0.383,-0.384 -1.005281,-0.384 -1.388281,0 l -0.749902,0.749902 -1.254964,-1.260092 1.758745,-1.921544 c 2.432997,1.372999 5.562621,1.049337 7.633619,-1.021661 1.880998,-1.880999 2.338306,-4.642505 1.379307,-6.9555028 L 22.995314,12.74916 19.523972,9.2778186 24.304118,4.4733176 C 23.583181,4.1792554 22.819739,4.0222887 22.053129,4.0028661 Z M 5.4565776,25.646195 c 0.2511248,0 0.5019995,0.09692 0.6934993,0.288424 0.3839996,0.383 0.3839996,1.003281 0,1.38828 -0.3829996,0.383 -1.0042808,0.383 -1.3882804,0 -0.3839996,-0.383999 -0.3839996,-1.00428 0,-1.38828 0.1919998,-0.1915 0.4436564,-0.288424 0.6947811,-0.288424 z"
+     sodipodi:nodetypes="ssccccccccccscccccccccccccccsccccssccccs"
+     id="path60" /></g><g
+   style="fill:#ffffff;fill-opacity:1"
+   id="I_PSP"
+   transform="matrix(0.02755588,0,0,0.02755588,109.17829,97.017535)"><path
+     d="m 394.50099,118.40641 -313.625408,0 C 19.303582,118.40641 0,177.316 0,238.889 0,300.462 19.303582,358.17138 80.875582,358.17138 l 313.625408,0 c 61.573,0 83.27701,-57.71038 83.27701,-119.28238 0,-61.573 -21.70401,-120.48259 -83.27701,-120.48259 z m -46.97508,203.70597 c 5.624,0 -4.558,10.18 -10.18,10.18 l -216.71733,0 c -5.622,0 -10.179,-4.556 -10.179,-10.18 V 154.46541 c 0,-5.623 4.557,-10.18 10.179,-10.18 l 216.71633,0 c 5.622,0 10.18,4.556 10.18,10.18 v 167.64697 z m 28.9719,-62.74938 c -0.132,0 -0.232,0.07 -0.365,0.07 -9.877,0 -17.886,-8.017 -17.886,-17.901 0,-9.868 8.009,-17.885 17.886,-17.885 0.132,0 0.233,0.07 0.365,0.07 9.713,0.209 17.536,8.079 17.536,17.815 0,9.752 -7.822,17.623 -17.536,17.831 z m 36.527,36.961 c -9.877,0 -17.886,-8.009 -17.886,-17.893 0,-9.884 8.009,-17.893 17.886,-17.893 9.892,0 17.901,8.009 17.901,17.893 -0.001,9.884 -8.01,17.893 -17.901,17.893 z m 0,-73.781 c -9.877,0 -17.886,-8.009 -17.886,-17.893 0,-9.884 8.009,-17.893 17.886,-17.893 9.892,0 17.901,8.009 17.901,17.893 -0.001,9.883 -8.01,17.893 -17.901,17.893 z m 36.89,36.89 c -9.877,0 -17.886,-8.017 -17.886,-17.901 0,-9.868 8.009,-17.885 17.886,-17.885 9.892,0 17.901,8.017 17.901,17.885 0,9.884 -8.009,17.901 -17.901,17.901 z"
+     style="fill:#ffffff;fill-opacity:1"
+     sodipodi:nodetypes="ssssssssssssssscscssscscsssssssssssssss"
+     id="path113" /></g></g><path
      id="I_GEAR"
      style="fill:#ececec;fill-opacity:1;stroke-width:0.019487"
      class="st0"