diff --git a/content/community/_index.html b/content/community/_index.html
index 0f13ea7c4..5c01a9f3d 100644
--- a/content/community/_index.html
+++ b/content/community/_index.html
@@ -18,7 +18,7 @@ <h2>Software</h2>
 community members.</p>
 <p>The Haiku project isn't legally or otherwise responsible for the contents of those sites.</p>
 
-<p><img src='/files/App_HaikuDepot_32.png' style='vertical-align: middle;'><a href="/community/software">Software Sites</a></b>
+<p><img src="/images/App_HaikuDepot.svg" style="vertical-align: middle;" width="32" height="32" alt=""><a href="/community/software">Software Sites</a></b>
 
 <h2><a href="/contact">Help and Support</a></h2>
 
@@ -38,19 +38,19 @@ <h2><a href="/community/getting-involved/">Getting Involved</a></h2>
 <h2 style="border_bottom:1px solid #cacaca"><a href="/community/organization">Organisational Structure</a></h2>
 <p>How does Haiku work? If you are interested in finding out how the Haiku Community is run, who is behind Haiku and the values empowering the project, then look no further than the links below.</p>
 <table style="width: 100%;">
-<tbody style="border-top:0px !important;margin-top:10x;">
+<tbody style="border-top:0px !important;margin-top:10px;">
 <tr>
 <td style="width: 50%">
 <ul>
-<img src='/images/File_HTML_32.png' style='vertical-align: middle;'> <a href="/community/links/">Our User Groups</a><br /><br />
-<img src='/images/File_Text_32.png' style='vertical-align: middle;'> <a href="/community/organization/policies/">Policies</a><br /><br />
-<img src='/images/App_People_32.png' style='vertical-align: middle;'> <a href="/community/organization/governance/">Governance</a><br /><br />
+<img src="/images/File_HTML.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/links/">Our User Groups</a><br /><br />
+<img src="/images/File_Text.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/organization/policies/">Policies</a><br /><br />
+<img src="/images/App_People.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/organization/governance/">Governance</a><br /><br />
 </ul>
 </td>
 <td style="margin-top:10px;">
 <ul>
-<img src='/images/ide_project_32.png' style='vertical-align: middle;'> <a href="/community/organization/initiatives">Initiatives</a><br /><br />
-<img src='/images/App_Generic_32.png' style='vertical-align: middle;'> <a href="/community/guidelines_creating_haiku_distribution">Haiku Distribution Guidelines</a><br /><br />
+<img src="/images/File_IDE_Project.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/organization/initiatives">Initiatives</a><br /><br />
+<img src="/images/App_Generic.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/guidelines_creating_haiku_distribution">Haiku Distribution Guidelines</a><br /><br />
 </ul>
 </td>
 </tr>
diff --git a/content/community/getting-involved/_index.md b/content/community/getting-involved/_index.md
index f285b0622..fb71fbbc1 100644
--- a/content/community/getting-involved/_index.md
+++ b/content/community/getting-involved/_index.md
@@ -12,17 +12,17 @@ tags = []
 <tr>
 <td style="width: 50%">
 <ul>
-<img src='/images/App_People_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/translating">Translating</a><br /><br />
-<img src='/images/ide_project_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/developing">Developing</a><br /><br />
-<img src='/images/System_Kernel_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/designing/">Designing</a><br /><br />
-<img src='/images/alert_idea_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/promotion/">Promotion</a><br /><br />
+<img src="/images/App_People.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/translating">Translating</a><br /><br />
+<img src="/images/File_IDE_Project.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/developing">Developing</a><br /><br />
+<img src="/images/System_Kernel.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/designing/">Designing</a><br /><br />
+<img src="/images/Alert_Idea.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/promotion/">Promotion</a><br /><br />
 </ul>
 </td>
 <td style="margin-top:10px;">
 <ul>
-<img src='/images/File_Text_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/documenting/">Documenting</a><br /><br />
-<img src='/images/Server_Syslog_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/testing/">Quality Testing</a><br /><br />
-<img src='/images/App_Finance_32.png' style='vertical-align: middle;'> <a href="/community/donating_to_haiku">Funding</a><br /><br />
+<img src="/images/File_Text.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/documenting/">Documenting</a><br /><br />
+<img src="/images/Server_Syslog.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/testing/">Quality Testing</a><br /><br />
+<img src="/images/App_Finance.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/donating_to_haiku">Funding</a><br /><br />
 </ul>
 </td>
 </tr>
@@ -38,18 +38,18 @@ Your skills, your interests, and the amount of time you wish to contribute all p
 <tr>
 <td style="width: 50%">
 <ul>
-<img src='/images/App_People_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/translating">Translating</a><br /><br />
-<img src='/images/ide_project_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/developing">Developing</a><br /><br />
-<img src='/images/System_Kernel_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/designing/">Designing</a><br /><br />
-<img src='/images/alert_idea_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/promotion/">Promotion</a><br /><br />
+<img src="/images/App_People.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/translating">Translating</a><br /><br />
+<img src="/images/File_IDE_Project.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/developing">Developing</a><br /><br />
+<img src="/images/System_Kernel.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/designing/">Designing</a><br /><br />
+<img src="/images/Alert_Idea.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/promotion/">Promotion</a><br /><br />
 </ul>
 </td>
 <td style="margin-top:10px;">
 <ul>
-<img src='/images/File_Text_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/documenting/">Documenting</a><br /><br />
-<img src='/images/Server_Syslog_32.png' style='vertical-align: middle;'> <a href="/community/getting-involved/testing/">Quality Testing</a><br /><br />
-<img src='/images/App_Finance_32.png' style='vertical-align: middle;'> <a href="/community/donating_to_haiku">Funding</a><br /><br />
-<img src='/images/App_People_32.png'  style='vertical-align: middle;'> Conferences: <a href="/conference">List</a> | <a href="/conference/map">Map</a> | <a href="/conference/calendar">Calendar</a>
+<img src="/images/File_Text.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/documenting/">Documenting</a><br /><br />
+<img src="/images/Server_Syslog.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/getting-involved/testing/">Quality Testing</a><br /><br />
+<img src="/images/App_Finance.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/donating_to_haiku">Funding</a><br /><br />
+<img src="/images/App_People.svg" style="vertical-align: middle;" width="32" height="32" alt=""> Conferences: <a href="/conference">List</a> | <a href="/conference/map">Map</a> | <a href="/conference/calendar">Calendar</a>
 </ul>
 </td>
 </tr>
diff --git a/content/community/gsoc/2017/ideas.html b/content/community/gsoc/2017/ideas.html
index 72a49ab19..2de3db12b 100644
--- a/content/community/gsoc/2017/ideas.html
+++ b/content/community/gsoc/2017/ideas.html
@@ -44,7 +44,7 @@ <h3>Project Areas</h3>
 <a id="applications" name="applications"></a>
 <h3>Applications</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite simple and can be improved in multiple ways. Some of the missing features are:
 </p>
@@ -57,7 +57,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services Kit network backend</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Extending and improving the Services Kit network backend</h4>
 <p>
 The WebKit browser and some other Haiku applications such as HaikuDepot use the Services Kit as a network backend. This is a library similar to <a href="http://curl.haxx.se/">curl</a> or <a href="https://wiki.gnome.org/action/show/Projects/libsoup">soup</a>, but nicely integrated into the Haiku API for easy use in native applications. The Services Kit is still a work in progress, however, and can be improved in several ways. The work on this task could include:</p>
 <ul>
@@ -71,7 +71,7 @@ <h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services
 <li>Possible mentors/knowledgeable people: PulkoMandy, Jessica Hamilton</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit1 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit1 port</h4>
 
 <p>Haiku has a native WebKit port which uses the WebKit1 API. This port is not complete and there are several bugs and minor problems which needs to be fixed.</p>
 
@@ -83,7 +83,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit1 port</h4>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Migrating Haiku WebKit port to WebKit2</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Migrating Haiku WebKit port to WebKit2</h4>
 <p>
 Haiku has a native WebKit port which uses the WebKit1 API. Since this port was made, the WebKit project migrated to WebKit2, which provides several new features and separates the work in several processes to limit the impact of crashes in one or the other.
 </p><p>
@@ -94,7 +94,7 @@ <h4><img src="/images/App_Generic_32.png"/>Migrating Haiku WebKit port to WebKit
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Porting LibreOffice</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Porting LibreOffice</h4>
 
 <p>While the Haiku operating system targets personal comuters, it is currently
 lacking some very important feature in that use case: an office suite.</p>
@@ -109,7 +109,7 @@ <h4><img src="/images/App_Generic_32.png"/>Porting LibreOffice</h4>
 	<li>Possible mentors: KapiX, waddlesplash</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -119,7 +119,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 <li>Possible mentors/knowledgeable people: mmu_man</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>KVM acceleration for Haiku's QEmu port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">KVM acceleration for Haiku's QEmu port</h4>
 
 <p>QEmu is a virtual machine allowing to run an operating system inside of another. While there already is an Haiku port, it currently does not support any acceleration system through native virtualization (KVM/KQemu). This makes it too slow for many uses. Fixing this would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -130,7 +130,7 @@ <h4><img src="/images/App_Generic_32.png"/>KVM acceleration for Haiku's QEmu por
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Calendar application</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Calendar application</h4>
 
 <p>Create a native calendar application or port an existing calendar application to Haiku. The app should support creating events and saving them to event files augmented with attributes similar to how People file work for contacts. Additional features of the calendar app might also include support for recurring events, integration with other calendaring software such as Google Calendar or Microsoft Outlook™, and vCalendar support ; CalDAV synchronization, import of iCal files, and more.</p>
 
@@ -147,7 +147,7 @@ <h4><img src="/images/App_Generic_32.png"/>Calendar application</h4>
 	<li>Possible mentors: scottmc, Sean Healy, waddlesplash</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -167,7 +167,7 @@ <h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
 <h3>Drivers</h3>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 USB Support for FreeBSD network compatibility layer
 </h4>
 
@@ -184,7 +184,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 XHCI USB3 driver
 </h4>
 <p>Like any other operating system, Haiku has drivers for all types of USB interfaces: OHCI and EHCI for USB1, UHCI for USB2, and XHCI for USB3. However, most of these still need some improvements to improve compatibility and add full support of the USB specification.</p>
@@ -196,7 +196,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 USB Webcam or soundcard support
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -211,7 +211,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 virtio network and balloon drivers
 </h4>
 
@@ -242,7 +242,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -255,7 +255,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 SD Host Controller support
 </h4>
 <p>Haiku has currently no support for SD Host Controller.</p>
@@ -273,7 +273,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -288,7 +288,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>3D acceleration support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">3D acceleration support</h4>
 <p>
 Haiku does not currently support hardware acceleration of 3D rendering. Using
 the Gallium infrastructure from Mesa, the goal of this project is to make the
@@ -309,7 +309,7 @@ <h4><img src="/images/App_Generic_32.png"/>3D acceleration support</h4>
 <h3>Kernel</h3>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -324,7 +324,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add write support for more filesystems (BIG)
 </h4>
 <p>Haiku has great support for its own file system, but most others are only available read-only. It is way better for interoperability with other systems to be able to write to these disks from Haiku.</p>
@@ -341,7 +341,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 File Systems: general improvements and new filesystems.
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other fielsystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -369,7 +369,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IMAP FS: File system access to an IMAP account
 </h4>
 
@@ -380,7 +380,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Support for 32 bit userland</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Support for 32 bit userland</h4>
 
 <p>
 Haiku is currently available in both 32 and 64 bit versions. However, the 64-bit 
@@ -401,7 +401,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Support for 32 bit userland</
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port / device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -417,7 +417,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -444,7 +444,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku Bluetooth Stack implements only basic functionality on lower and middle layers. This functionality needs to be completed and Bluetooth 2.X and later possibilities explored. This task involves investigating the current state of the Bluetooth code, checking that the basic functionality is still working (pairing devices, etc), and improving the stack to make it more useful by implementing driver(s) for Bluetooth device(s) of your choice (file transfers, audio, HID, networking, etc).</p>
@@ -457,7 +457,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC framing and VJC compression (porting both algorithms is sufficient, but make sure the license is compatible to MIT). Implement CHAP authentication. Find and fix bugs.</p>
@@ -469,7 +469,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -478,7 +478,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 Finalization
 </h4>
 <p>
@@ -502,7 +502,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 TCP optimization and finetuning
 </h4>
 <p>
@@ -527,7 +527,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <a id="user-interface" name="user-interface"></a>
 <h3>User Interface</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -549,7 +549,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -584,7 +584,7 @@ <h5>Existing work</h5>
 <a id="media" name="media"></a>
 <h3>Media</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides an unified API to handle audio and video streams, including codec
@@ -618,7 +618,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -653,7 +653,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -675,7 +675,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -690,7 +690,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
 <h3>Other</h3>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Trac Plugin: "Test and Commit Patch" functionality
 </h4>
 <p>
@@ -701,7 +701,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -717,7 +717,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: already a lot of projects already useful on this level (Heidi, Koder, Paladin...)
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Graphical project manager tool
 </h4>
 
@@ -735,7 +735,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Tracker add-on for a version control system
 </h4>
 
@@ -761,7 +761,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -772,7 +772,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -784,7 +784,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2018/ideas.html b/content/community/gsoc/2018/ideas.html
index 972a3b26f..eca662028 100644
--- a/content/community/gsoc/2018/ideas.html
+++ b/content/community/gsoc/2018/ideas.html
@@ -44,7 +44,7 @@ <h3>Project Areas</h3>
 <a id="applications" name="applications"></a>
 <h3>Applications</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -66,7 +66,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services Kit network backend</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Extending and improving the Services Kit network backend</h4>
 <p>
 The Haiku API includes a framework for performing requests to websites using
 HTTP and other protocols. This is similar to 
@@ -92,7 +92,7 @@ <h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services
 <li><a href="https://git.haiku-os.org/haiku/tree/src/kits/network/libnetapi">Sourcecode</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit1 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit1 port</h4>
 
 <p>Haiku has a native WebKit port which uses the WebKit1 API. This port is not complete and there are several bugs and minor problems which needs to be fixed.</p>
 
@@ -106,7 +106,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit1 port</h4>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Migrating Haiku WebKit port to WebKit2</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Migrating Haiku WebKit port to WebKit2</h4>
 <p>
 Haiku has a native WebKit port which uses the WebKit1 API. Since this port was made, the WebKit project migrated to WebKit2, which provides several new features and separates the work in several processes to limit the impact of crashes in one or the other.
 </p><p>
@@ -118,7 +118,7 @@ <h4><img src="/images/App_Generic_32.png"/>Migrating Haiku WebKit port to WebKit
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -128,7 +128,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 <li>Possible mentors/knowledgeable people: mmu_man</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>KVM acceleration for Haiku's QEmu port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">KVM acceleration for Haiku's QEmu port</h4>
 
 <p>QEmu is a virtual machine allowing to run an operating system inside of another. While there already is an Haiku port, it currently does not support any acceleration system through native virtualization (KVM/KQemu). This makes it too slow for many uses. Fixing this would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -139,7 +139,7 @@ <h4><img src="/images/App_Generic_32.png"/>KVM acceleration for Haiku's QEmu por
 <li><a href="https://github.com/mmlr/qemu-haiku">Sourcecode (QEmu for Haku)</a></li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -166,7 +166,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Existing code: <a href="https://cgit.haiku-os.org/haiku/tree/src/apps/devices">"Devices"</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -186,7 +186,7 @@ <h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
 <a id="drivers" name="drivers"></a>
 <h3>Drivers</h3>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 SDHCI MMC Driver
 </h4>
 
@@ -209,7 +209,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 <li>Possible mentors: korli</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 USB Support for FreeBSD network compatibility layer
 </h4>
 
@@ -226,7 +226,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 <li>Possible mentors: korli</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 NVMe driver
 </h4>
 <p>NVMe is a standard protocol for SSD attached to the PCI-express port. Unlike SATA and AHCI,
@@ -245,7 +245,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 
 
 
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 USB Webcam or soundcard support - isochronous USB transfers
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -276,7 +276,7 @@ <h4><img src="/images/webcam.png"/>
 </ul>
 
 
-<h4><img src="/images/Prefs_VirtualMemory.png"/>
+<h4><img src="/images/Prefs_VirtualMemory.svg" width="32" height="32" alt="">
 virtio balloon memory driver
 </h4>
 
@@ -306,7 +306,7 @@ <h4><img src="/images/Prefs_VirtualMemory.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -323,7 +323,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -338,7 +338,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>3D acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">3D acceleration support</h4>
 <p>
 Haiku does not currently support hardware acceleration of 3D rendering. Using
 the Gallium infrastructure from Mesa, the goal of this project is to make the
@@ -370,7 +370,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>3D acceleration support</h4>
 <h3>Kernel</h3>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -385,7 +385,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -411,7 +411,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 File Systems: general improvements and new filesystems.
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other fielsystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -439,7 +439,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IMAP FS: File system access to an IMAP account
 </h4>
 
@@ -450,7 +450,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Support for 32 bit userland</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Support for 32 bit userland</h4>
 
 <p>
 Haiku is currently available in both 32 and 64 bit versions. However, the 64-bit 
@@ -471,7 +471,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Support for 32 bit userland</
 </ul>
 	
 	
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -485,7 +485,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port / device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -501,7 +501,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -528,7 +528,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku Bluetooth Stack implements only basic functionality on lower and middle layers. This functionality needs to be completed and Bluetooth 2.X and later possibilities explored. This task involves investigating the current state of the Bluetooth code, checking that the basic functionality is still working (pairing devices, etc), and improving the stack to make it more useful by implementing driver(s) for Bluetooth device(s) of your choice (file transfers, audio, HID, networking, etc).</p>
@@ -541,7 +541,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC framing and VJC compression (porting both algorithms is sufficient, but make sure the license is compatible to MIT). Implement CHAP authentication. Find and fix bugs.</p>
@@ -553,7 +553,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -562,7 +562,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 Finalization
 </h4>
 <p>
@@ -591,7 +591,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <a id="user-interface" name="user-interface"></a>
 <h3>User Interface</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -613,7 +613,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -648,7 +648,7 @@ <h5>Existing work</h5>
 <a id="media" name="media"></a>
 <h3>Media</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides an unified API to handle audio and video streams, including codec
@@ -682,7 +682,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -717,7 +717,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -739,7 +739,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -755,7 +755,7 @@ <h3>Other</h3>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Jam (build system) replacement/rewrite
 </h4>
 <p>Haiku uses Jam as its main build system. Unfortunately, Perforce is not actively
@@ -770,7 +770,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style check tool
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -787,7 +787,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Possible mentors: PulkoMandy</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -802,7 +802,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Tracker add-on for a version control system
 </h4>
 
@@ -828,7 +828,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -839,7 +839,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -851,7 +851,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -874,7 +874,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2019/ideas.html b/content/community/gsoc/2019/ideas.html
index 04aeff324..79f60ff71 100644
--- a/content/community/gsoc/2019/ideas.html
+++ b/content/community/gsoc/2019/ideas.html
@@ -45,7 +45,7 @@ <h3>Project Areas</h3>
 <a id="applications" name="applications"></a>
 <h3>Applications</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -67,7 +67,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services Kit network backend</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Extending and improving the Services Kit network backend</h4>
 <p>
 The Haiku API includes a framework for performing requests to websites using
 HTTP and other protocols. This is similar to 
@@ -93,7 +93,7 @@ <h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services
 <li><a href="https://git.haiku-os.org/haiku/tree/src/kits/network/libnetapi">Sourcecode</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit1 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit1 port</h4>
 
 <p>Haiku has a native WebKit port which uses the WebKit1 API. This port is not complete and there are several bugs and minor problems which needs to be fixed.</p>
 
@@ -107,7 +107,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit1 port</h4>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Migrating Haiku WebKit port to WebKit2</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Migrating Haiku WebKit port to WebKit2</h4>
 <p>
 Haiku has a native WebKit port which uses the WebKit1 API. Since this port was made, the WebKit project migrated to WebKit2, which provides several new features and separates the work in several processes to limit the impact of crashes in one or the other.
 </p><p>
@@ -119,7 +119,7 @@ <h4><img src="/images/App_Generic_32.png"/>Migrating Haiku WebKit port to WebKit
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>better XMPP client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">better XMPP client for Haiku</h4>
 <p>Most of Haiku communication channels are hosted on IRC servers. IRC is a
 simple protocol, but it lacks modern features. As a result, people are migrating to other chat services such as keybase, Telegram, and many others.</p>
 <p>We would prefer to use an open source solution, and XMPP is a good candidate. However, there exists no good native client on Haiku, so its use is limited.</p>
@@ -131,7 +131,7 @@ <h4><img src="/images/App_Generic_32.png"/>better XMPP client for Haiku</h4>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -141,7 +141,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 <li>Possible mentors/knowledgeable people: mmu_man</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>KVM acceleration for Haiku's QEmu port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">KVM acceleration for Haiku's QEmu port</h4>
 
 <p>QEmu is a virtual machine allowing to run an operating system inside of another. While there already is an Haiku port, it currently does not support any acceleration system through native virtualization (KVM/KQemu). This makes it too slow for many uses. Fixing this would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -152,7 +152,7 @@ <h4><img src="/images/App_Generic_32.png"/>KVM acceleration for Haiku's QEmu por
 <li><a href="https://github.com/mmlr/qemu-haiku">Sourcecode (QEmu for Haku)</a></li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Unify input preferences
 </h4>
 <p>Haiku comes with multiple preference panels for input devices: keyboard, keymap, mouse, and touchpad. The goal of this project is to merge these into a single redesigned "Input devices" preference panel. It should allow having different settings for each device (for example, a different speed for a mouse and a touchpad on the same machine, or different keymaps for multiple keyboards). The panel can also be extended to support joysticks/gamepads and other USB HID input devices.</p>
@@ -161,7 +161,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Possible mentors: PulkoMandy</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -188,7 +188,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Existing code: <a href="https://cgit.haiku-os.org/haiku/tree/src/apps/devices">"Devices"</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -208,7 +208,7 @@ <h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
 <a id="drivers" name="drivers"></a>
 <h3>Drivers</h3>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 	Improving intel video driver
 </h4>
 
@@ -224,7 +224,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Possible mentors/knowledgeable people: PulkoMandy, waddlesplash</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 USB Support for FreeBSD network compatibility layer
 </h4>
 
@@ -240,7 +240,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 <li>Possible mentors: waddlesplash, korli</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 NVMe driver
 </h4>
 <p>NVMe is a standard protocol for SSD attached to the PCI-express port. Unlike SATA and AHCI,
@@ -259,7 +259,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 
 
 
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 Isochronous USB transfers (USB Webcam &amp; soundcard support)
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -291,7 +291,7 @@ <h4><img src="/images/webcam.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -308,7 +308,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -322,7 +322,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -349,7 +349,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -363,7 +363,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Skill set: kernel development, general C/C++, userland development, debugging, power management / measurement</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -389,7 +389,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 File Systems: general improvements and new filesystems.
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other fielsystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -416,7 +416,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -431,7 +431,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port / device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -447,7 +447,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -474,7 +474,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -489,7 +489,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Possible mentors/knowledgeable people: waddlesplash <!-- also possibly PulkoMandy --></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -503,7 +503,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -512,7 +512,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization
 </h4>
 <p>
@@ -543,7 +543,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -566,7 +566,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -602,7 +602,7 @@ <h5>Existing work</h5>
 <h3>Media</h3>
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides an unified API to handle audio and video streams, including codec
@@ -636,7 +636,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -672,7 +672,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -695,7 +695,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -710,7 +710,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
 <h3>Other</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Jam (build system) replacement/rewrite
 </h4>
 <p>Haiku uses Jam as its main build system. Unfortunately, Perforce is not actively
@@ -725,7 +725,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Possible mentors: waddlesplash</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style checker bot for Gerrit
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -743,7 +743,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -760,7 +760,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -771,7 +771,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -783,7 +783,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -806,7 +806,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2020/ideas.html b/content/community/gsoc/2020/ideas.html
index f9a6dab06..9c29ed2f0 100644
--- a/content/community/gsoc/2020/ideas.html
+++ b/content/community/gsoc/2020/ideas.html
@@ -47,7 +47,7 @@ <h3>Project Areas</h3>
 <h3>Applications</h3>
 
 <!-- on hold until webkit2 is ready, there's little point otherwise
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -70,7 +70,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services Kit network backend</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Extending and improving the Services Kit network backend</h4>
 <p>
 The Haiku API includes a framework for performing requests to websites using
 HTTP and other protocols. This is similar to
@@ -96,7 +96,7 @@ <h4><img src="/images/App_Generic_32.png"/>Extending and improving the Services
 <li><a href="https://git.haiku-os.org/haiku/tree/src/kits/network/libnetapi">Sourcecode</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit2 port</h4>
 
 <p>Haiku has a native WebKit port which uses the WebKit1 API. This port is not complete and there are several bugs and minor problems which needs to be fixed.
 The plan is to replace this with a more up to date port based on the WebKit2 API. Based on the work completed in GSoC 2019, WebKit2 on Haiku is now able to render some web pages.
@@ -111,7 +111,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Better XMPP instant messaging client for Haiku</h4>
 <p>Most of Haiku communication channels are hosted on IRC servers. IRC is a
 simple protocol, but it lacks modern features. As a result, people are migrating to other chat services such as keybase, Telegram, and many others.</p>
 <p>We would prefer to use an open source solution, and XMPP is a good candidate. However, there exists no good native client on Haiku, so its use is limited.</p>
@@ -123,7 +123,7 @@ <h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku user to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -133,7 +133,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 <li>Possible mentors/knowledgeable people: mmu_man</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEMU port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Hardware acceleration for Haiku's QEMU port</h4>
 
 <p>QEMU is a virtual machine which allows running an operating system inside of another. While there already is a Haiku port, it currently does not support any acceleration system through native virtualization (through Intel VT-x and AMD SVM.) This makes it too slow for many uses. Fixing this would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -147,7 +147,7 @@ <h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEM
 <li><a href="https://nxr.netbsd.org/xref/src/sys/dev/nvmm/">NVMM Sourcecode</a></li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -174,7 +174,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Existing code: <a href="https://cgit.haiku-os.org/haiku/tree/src/apps/devices">"Devices"</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -194,7 +194,7 @@ <h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
 <a id="drivers" name="drivers"></a>
 <h3>Drivers</h3>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 	Improving intel video driver
 </h4>
 
@@ -210,7 +210,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Possible mentors/knowledgeable people: PulkoMandy, waddlesplash</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 USB Support for FreeBSD network compatibility layer
 </h4>
 
@@ -229,7 +229,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 
 <!-- USB isochronous appears to work well enough, to be revisited with more focus
 	on the webcam and audio drivers
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 Isochronous USB transfers (USB Webcam &amp; soundcard support)
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -262,7 +262,7 @@ <h4><img src="/images/webcam.png"/>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -279,7 +279,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -293,7 +293,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -320,7 +320,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -334,7 +334,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Skill set: kernel development, general C/C++, userland development, debugging, power management / measurement</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -362,7 +362,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting Apple NTFS driver to Haiku
 </h4>
 
@@ -379,7 +379,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Adding a new filesystem to Haiku
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other filesystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -404,7 +404,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Filesystems benchmarking and stress-test
 </h4>
 
@@ -426,7 +426,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -441,7 +441,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port / device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -457,7 +457,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -484,7 +484,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -499,7 +499,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Possible mentors/knowledgeable people: waddlesplash <!-- also possibly PulkoMandy --></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"\>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 VPN Support
 </h4>
 <p>With the decline of internet freedoms (Government IP Blocks, Net Neutrality reductions), the usage of encrypted virtual
@@ -512,7 +512,7 @@ <h4><img src="/images/App_Generic_32.png"\>
 <li>Possible mentors/knowledgeable people: kallisti5 <!-- also possibly PulkoMandy, waddlesplash --></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -526,7 +526,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -535,7 +535,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization
 </h4>
 <p>
@@ -566,7 +566,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -589,7 +589,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -625,7 +625,7 @@ <h5>Existing work</h5>
 <h3>Media</h3>
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides an unified API to handle audio and video streams, including codec
@@ -659,7 +659,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -695,7 +695,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -718,7 +718,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -732,7 +732,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
 <h3>Ports</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting the Go Programming Language to Haiku
 </h4>
 
@@ -763,7 +763,7 @@ <h5>Existing work</h5>
 <h3>Other</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Jam (build system) replacement/rewrite
 </h4>
 <p>Haiku uses Jam as its main build system. Unfortunately, Perforce is not actively
@@ -778,7 +778,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Possible mentors: waddlesplash</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style checker bot for Gerrit
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -796,7 +796,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -813,7 +813,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -824,7 +824,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -836,7 +836,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -859,7 +859,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2021/ideas.html b/content/community/gsoc/2021/ideas.html
index 68d1170f1..2a39ef9f3 100644
--- a/content/community/gsoc/2021/ideas.html
+++ b/content/community/gsoc/2021/ideas.html
@@ -47,7 +47,7 @@ <h3>Project Areas</h3>
 <h3>Applications</h3>
 
 <!-- on hold until webkit2 is ready, there's little point otherwise
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -70,7 +70,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit2 port</h4>
 
 <h5>Idea description</h5>
 
@@ -94,7 +94,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Better XMPP instant messaging client for Haiku</h4>
 
 <h5>Idea description</h5>
 
@@ -120,7 +120,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -130,7 +130,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 <li>Possible mentors/knowledgeable people: mmu_man</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEMU port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Hardware acceleration for Haiku's QEMU port</h4>
 
 <p>QEMU is a virtual machine which allows running an operating system inside of another. While there already is a Haiku port, it currently does not support any acceleration system through native virtualization (through Intel VT-x and AMD SVM.) This makes it too slow for many uses. Fixing this would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -144,7 +144,7 @@ <h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEM
 <li><a href="https://nxr.netbsd.org/xref/src/sys/dev/nvmm/">NVMM Sourcecode</a></li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -171,7 +171,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Existing code: <a href="https://cgit.haiku-os.org/haiku/tree/src/apps/devices">"Devices"</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -191,7 +191,7 @@ <h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
 <a id="drivers" name="drivers"></a>
 <h3>Drivers</h3>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 	Improving intel video driver
 </h4>
 
@@ -207,7 +207,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Possible mentors/knowledgeable people: PulkoMandy, waddlesplash</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 USB Support for FreeBSD network compatibility layer
 </h4>
 
@@ -226,7 +226,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 
 <!-- USB isochronous appears to work well enough, to be revisited with more focus
 	on the webcam and audio drivers
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 Isochronous USB transfers (USB Webcam &amp; soundcard support)
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -259,7 +259,7 @@ <h4><img src="/images/webcam.png"/>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -276,7 +276,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -290,7 +290,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -317,7 +317,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -331,7 +331,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Skill set: kernel development, general C/C++, userland development, debugging, power management / measurement</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -359,7 +359,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting Apple NTFS driver to Haiku
 </h4>
 
@@ -376,7 +376,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Adding write support for more filesystems</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Adding write support for more filesystems</h4>
 
 <h5>Idea description</h5>
 
@@ -403,7 +403,7 @@ <h5>Further details</h5>
 </ul>
 
 <!-- Removed for now, we have enough filesystems
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Adding a new filesystem to Haiku
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other filesystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -422,7 +422,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Filesystems benchmarking and stress-test
 </h4>
 
@@ -444,7 +444,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -461,7 +461,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 
 <!-- On hold because the kernel currently doesn't boot at all. If we can't figure it out, nor can we
 guide students through it.
-<h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port / device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -478,7 +478,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port / device tree support</h4>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -505,7 +505,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -520,7 +520,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Possible mentors/knowledgeable people: waddlesplash <!-- also possibly PulkoMandy --></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"\>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 VPN Support
 </h4>
 <p>With the decline of internet freedoms (Government IP Blocks, Net Neutrality reductions), the usage of encrypted virtual
@@ -533,7 +533,7 @@ <h4><img src="/images/App_Generic_32.png"\>
 <li>Possible mentors/knowledgeable people: kallisti5 <!-- also possibly PulkoMandy, waddlesplash --></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -547,7 +547,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -556,7 +556,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization
 </h4>
 <p>
@@ -582,7 +582,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <li>Possible mentors: </li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>MDNS / Bonjour / Avahi network discovery</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">MDNS / Bonjour / Avahi network discovery</h4>
 
 <h5>Idea description</h5>
 
@@ -603,7 +603,7 @@ <h5>Further details</h5>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -626,7 +626,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -664,7 +664,7 @@ <h3>Media</h3>
 -->
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides a unified API to handle audio and video streams, including codec
@@ -699,7 +699,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 -->
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -736,7 +736,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -759,7 +759,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -773,7 +773,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
 <h3>Ports</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting the Go Programming Language to Haiku
 </h4>
 
@@ -804,7 +804,7 @@ <h5>Existing work</h5>
 <h3>Other</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Jam (build system) replacement/rewrite
 </h4>
 <p>Haiku uses Jam as its main build system. Unfortunately, Perforce is not actively
@@ -819,7 +819,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Possible mentors: waddlesplash</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style checker bot for Gerrit
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -837,7 +837,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -854,7 +854,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -865,7 +865,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -877,7 +877,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	External font loading in app_server/interface kit
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -896,7 +896,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -919,7 +919,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2022/ideas.html b/content/community/gsoc/2022/ideas.html
index 62efc7823..708987596 100644
--- a/content/community/gsoc/2022/ideas.html
+++ b/content/community/gsoc/2022/ideas.html
@@ -47,7 +47,7 @@ <h3>Project Areas</h3>
 <h3>Applications</h3>
 
 <!-- on hold until webkit2 is ready, there's little point otherwise
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -70,7 +70,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit2 port</h4>
 
 <h5>Idea description</h5>
 
@@ -96,7 +96,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Better XMPP instant messaging client for Haiku</h4>
 
 <h5>Idea description</h5>
 
@@ -124,7 +124,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -136,7 +136,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 	<li>Difficulty: hard</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEMU port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Hardware acceleration for Haiku's QEMU port</h4>
 
 <p>QEMU is a virtual machine which allows running an operating system inside of another. While there already is a Haiku port, it currently does not support any acceleration system through native virtualization (through Intel VT-x and AMD SVM.) This makes it too slow for many uses. Fixing this would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -152,7 +152,7 @@ <h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEM
 	<li>Difficulty: medium/hard</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -181,7 +181,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Difficulty: easy/medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -205,7 +205,7 @@ <h3>Drivers</h3>
 
 <!-- USB isochronous appears to work well enough, to be revisited with more focus
 	on the webcam and audio drivers
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 Isochronous USB transfers (USB Webcam &amp; soundcard support)
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -238,7 +238,7 @@ <h4><img src="/images/webcam.png"/>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -255,7 +255,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -269,7 +269,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -298,7 +298,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 epoll or kqueue implementation
 </h4>
 
@@ -313,7 +313,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -329,7 +329,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: hard</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -359,7 +359,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Adding write support for more filesystems</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Adding write support for more filesystems</h4>
 
 <h5>Idea description</h5>
 
@@ -388,7 +388,7 @@ <h5>Further details</h5>
 </ul>
 
 <!-- Removed for now, we have enough filesystems
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Adding a new filesystem to Haiku
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other filesystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -407,7 +407,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Filesystems benchmarking and stress-test
 </h4>
 
@@ -431,7 +431,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -448,7 +448,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port and device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port and device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -466,7 +466,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port and device tree support</h4>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -493,7 +493,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -510,7 +510,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"\>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 VPN Support
 </h4>
 <p>With the decline of internet freedoms (Government IP Blocks, Net Neutrality reductions), the usage of encrypted virtual
@@ -525,7 +525,7 @@ <h4><img src="/images/App_Generic_32.png"\>
 	<li>Difficulty: medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -541,7 +541,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -550,7 +550,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization
 </h4>
 <p>
@@ -578,7 +578,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: easy</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>MDNS / Bonjour / Avahi network discovery</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">MDNS / Bonjour / Avahi network discovery</h4>
 
 <h5>Idea description</h5>
 
@@ -601,7 +601,7 @@ <h5>Further details</h5>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -624,7 +624,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -664,7 +664,7 @@ <h3>Media</h3>
 -->
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides a unified API to handle audio and video streams, including codec
@@ -699,7 +699,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 -->
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -736,7 +736,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -759,7 +759,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -773,7 +773,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
 <h3>Ports</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting the Go Programming Language to Haiku
 </h4>
 
@@ -806,7 +806,7 @@ <h5>Existing work</h5>
 <h3>Other</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Jam (build system) replacement/rewrite
 </h4>
 <p>Haiku uses Jam as its main build system. Unfortunately, Perforce is not actively
@@ -824,7 +824,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!-- Hidden for now: we need to figure out what to do with previous year's students work before adding mode
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style checker bot for Gerrit
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -843,7 +843,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -862,7 +862,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -873,7 +873,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -887,7 +887,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -912,7 +912,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2023/ideas.html b/content/community/gsoc/2023/ideas.html
index aedd114b8..1f743c811 100644
--- a/content/community/gsoc/2023/ideas.html
+++ b/content/community/gsoc/2023/ideas.html
@@ -47,7 +47,7 @@ <h3>Project Areas</h3>
 <h3>Applications</h3>
 
 <!-- on hold until webkit2 is ready, there's little point otherwise
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -70,7 +70,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit2 port</h4>
 
 <h5>Idea description</h5>
 
@@ -96,7 +96,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Better XMPP instant messaging client for Haiku</h4>
 
 <h5>Idea description</h5>
 
@@ -124,7 +124,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -136,7 +136,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 	<li>Difficulty: hard</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEMU port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Hardware acceleration for Haiku's QEMU port</h4>
 
 <p>QEMU is a virtual machine which allows running an operating system inside of another. While there already is a Haiku port, it currently does not support any acceleration system through native virtualization (through Intel VT-x and AMD SVM.) This makes it too slow for many uses. Fixing this would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -152,7 +152,7 @@ <h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEM
 	<li>Difficulty: medium/hard</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -182,7 +182,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Difficulty: easy/medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -205,7 +205,7 @@ <h3>Drivers</h3>
 
 <!-- USB isochronous appears to work well enough, to be revisited with more focus
 	on the webcam and audio drivers
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 Isochronous USB transfers (USB Webcam &amp; soundcard support)
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -238,7 +238,7 @@ <h4><img src="/images/webcam.png"/>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -255,7 +255,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -269,7 +269,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -298,7 +298,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 epoll or kqueue implementation
 </h4>
 
@@ -313,7 +313,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -329,7 +329,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: hard</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -359,7 +359,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Adding write support for more filesystems</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Adding write support for more filesystems</h4>
 
 <h5>Idea description</h5>
 
@@ -387,7 +387,7 @@ <h5>Further details</h5>
 </ul>
 
 <!-- Removed for now, we have enough filesystems
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Adding a new filesystem to Haiku
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other filesystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -406,7 +406,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Filesystems benchmarking and stress-test
 </h4>
 
@@ -430,7 +430,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -447,7 +447,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port and device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port and device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -465,7 +465,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port and device tree support</h4>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -492,7 +492,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -509,7 +509,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"\>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 VPN Support
 </h4>
 <p>With the decline of internet freedoms (Government IP Blocks, Net Neutrality reductions), the usage of encrypted virtual
@@ -524,7 +524,7 @@ <h4><img src="/images/App_Generic_32.png"\>
 	<li>Difficulty: medium</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -540,7 +540,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -549,7 +549,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization and stabilization
 </h4>
 <p>
@@ -574,7 +574,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: easy</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>MDNS / Bonjour / Avahi network discovery</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">MDNS / Bonjour / Avahi network discovery</h4>
 
 <h5>Idea description</h5>
 
@@ -597,7 +597,7 @@ <h5>Further details</h5>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -619,7 +619,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Tracker query window user interface rework
 </h4>
 
@@ -641,7 +641,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Difficulty: easy</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -681,7 +681,7 @@ <h3>Media</h3>
 -->
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides a unified API to handle audio and video streams, including codec
@@ -716,7 +716,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 -->
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -753,7 +753,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -776,7 +776,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Clockwerk</h4>
 
 <p>Clockwerk is a video editing bench for Haiku. It works well, but it is a bit
 unstable and the feature set is not that complete.</p>
@@ -790,7 +790,7 @@ <h4><img src="/images/App_Generic_32.png"/>Improving Clockwerk</h4>
 <h3>Ports</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting the Go Programming Language to Haiku
 </h4>
 
@@ -824,7 +824,7 @@ <h3>Other</h3>
 
 
 <!-- Hidden for now: we need to figure out what to do with previous year's students work before adding mode
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style checker bot for Gerrit
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -843,7 +843,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -862,7 +862,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -873,7 +873,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -887,7 +887,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -912,7 +912,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2024/ideas.html b/content/community/gsoc/2024/ideas.html
index a9960a4bf..176bdba1f 100644
--- a/content/community/gsoc/2024/ideas.html
+++ b/content/community/gsoc/2024/ideas.html
@@ -47,7 +47,7 @@ <h3>Project Areas</h3>
 <h3>Applications</h3>
 
 <!-- on hold until webkit2 is ready, there's little point otherwise
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -70,7 +70,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit video and audio support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit video and audio support</h4>
 
 <h5>Idea description</h5>
 
@@ -94,7 +94,7 @@ <h5>Idea description</h5>
 <li><a href="https://github.com/haiku/haikuwebkit/">Sourcecode of WebKit ported to Haiku</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit2 port</h4>
 
 <h5>Idea description</h5>
 
@@ -121,7 +121,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Better XMPP instant messaging client for Haiku</h4>
 
 <h5>Idea description</h5>
 
@@ -151,7 +151,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -164,7 +164,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 	<li>Expected outcome: a version of Virtualbox that runs on Haiku and is able to run other operating systems.</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEMU port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Hardware acceleration for Haiku's QEMU port</h4>
 
 <p>QEMU is a virtual machine which allows running an operating system inside of another. While there already is a Haiku port, it currently does not support any acceleration system through native virtualization (through Intel VT-x and AMD SVM.) This makes it too slow for many uses. Fixing this would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -181,7 +181,7 @@ <h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEM
 	<li>Expected outcome: NVMM driver ported to Haiku, demonstration of QEMU using said driver to accelerate virtual machines.</li>
 </ul>
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -212,7 +212,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Expected outcome: finalized version of Devices application, showing extra information about devices, including but not limited to the driver in use for each device.</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -236,7 +236,7 @@ <h3>Drivers</h3>
 
 <!-- USB isochronous appears to work well enough, to be revisited with more focus
 	on the webcam and audio drivers
-<h4><img src="/images/webcam.png"/>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">
 Isochronous USB transfers (USB Webcam &amp; soundcard support)
 </h4>
 <p>Currently Haiku has very limited support for webcams and USB sound cards.
@@ -269,7 +269,7 @@ <h4><img src="/images/webcam.png"/>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -286,7 +286,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -300,7 +300,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -330,7 +330,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -347,7 +347,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: improved power management in Haiku code (applications, drivers, ...) with benchmarks to measure the results (this may involve also developping the tools needed for benchmarking)</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -378,7 +378,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Adding write support for more filesystems</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Adding write support for more filesystems</h4>
 
 <h5>Idea description</h5>
 
@@ -407,7 +407,7 @@ <h5>Further details</h5>
 </ul>
 
 <!-- Removed for now, we have enough filesystems
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Adding a new filesystem to Haiku
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other filesystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -426,7 +426,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Filesystems benchmarking and stress-test
 </h4>
 
@@ -452,7 +452,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- Removed for now
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -470,7 +470,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 !-->
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM port and device tree support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM port and device tree support</h4>
 
 <p>Unlike x86 systems which have a PCI bus, most ARM devices have peripherals at hardcoded addresses. This means automatic hardware discovery is not possible. The Linux kernel developers designed a solution called "flattened device tree". It is a static description of the hardware, telling the kernel where devices are located and which driver to use.</p>
 
@@ -489,7 +489,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM port and device tree support</h4>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -516,7 +516,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -534,7 +534,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: the Bluetooth stack can be used for more than just pairing devices. For example, bluetooth audio or bluetooth HID drivers can be used.</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -551,7 +551,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -560,7 +560,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization and stabilization
 </h4>
 <p>
@@ -586,7 +586,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: IPv6 auto-configuration works, and it is possible to access website and other internet services over IPv6</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>MDNS / Bonjour / Avahi network discovery</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">MDNS / Bonjour / Avahi network discovery</h4>
 
 <h5>Idea description</h5>
 
@@ -610,7 +610,7 @@ <h5>Further details</h5>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -632,7 +632,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Tracker query window user interface rework
 </h4>
 
@@ -655,7 +655,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: the new query window interface is implemented and working as documented in the linked tickets (or a refined version after discussion with the mentor and community).</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -696,7 +696,7 @@ <h3>Media</h3>
 -->
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides a unified API to handle audio and video streams, including codec
@@ -731,7 +731,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 -->
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -768,7 +768,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -794,7 +794,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <h3>Ports</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting the Go Programming Language to Haiku
 </h4>
 
@@ -839,7 +839,7 @@ <h3>Other</h3>
 
 
 <!-- Hidden for now: we need to figure out what to do with previous year's students work before adding mode
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Coding style checker bot for Gerrit
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -858,7 +858,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -878,7 +878,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -889,7 +889,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -904,7 +904,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -930,7 +930,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/community/gsoc/2025/ideas.html b/content/community/gsoc/2025/ideas.html
index 0d1dee95c..a45a2d95e 100644
--- a/content/community/gsoc/2025/ideas.html
+++ b/content/community/gsoc/2025/ideas.html
@@ -47,7 +47,7 @@ <h3>Project Areas</h3>
 <h3>Applications</h3>
 
 <!-- on hold until webkit2 is ready, there's little point otherwise
-<h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Updating and Extending WebPositive</h4>
 <p>
 Haiku uses a WebKit based browser called WebPositive. The browser is still quite
 simple and can be improved in multiple ways. Some of the missing features are:
@@ -70,7 +70,7 @@ <h4><img src="/images/App_Generic_32.png"/>Updating and Extending WebPositive</h
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit video and audio support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit video and audio support</h4>
 
 <h5>Idea description</h5>
 
@@ -94,7 +94,7 @@ <h5>Idea description</h5>
 <li><a href="https://github.com/haiku/haikuwebkit/">Sourcecode of WebKit ported to Haiku</a></li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Improving Haiku's WebKit2 port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Improving Haiku's WebKit2 port</h4>
 
 <h5>Idea description</h5>
 
@@ -121,7 +121,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Better XMPP instant messaging client for Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Better XMPP instant messaging client for Haiku</h4>
 
 <h5>Idea description</h5>
 
@@ -151,7 +151,7 @@ <h5>Further reading</h5>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">VirtualBox port to Haiku</h4>
 
 <p>VirtualBox is a virtual machine allowing to run an operating system inside of another. Porting it to Haiku would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -165,7 +165,7 @@ <h4><img src="/images/App_Generic_32.png"/>VirtualBox port to Haiku</h4>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEMU port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Hardware acceleration for Haiku's QEMU port</h4>
 
 <p>QEMU is a virtual machine which allows running an operating system inside of another. While there already is a Haiku port, it currently does not support any acceleration system through native virtualization (through Intel VT-x and AMD SVM.) This makes it too slow for many uses. Fixing this would allow Haiku users to run another system, such as Windows or Linux, when they need to run an application that is not yet available for Haiku. This would make using Haiku as their primary operating system a viable approach for more people.</p>
 
@@ -183,7 +183,7 @@ <h4><img src="/images/App_Generic_32.png"/>Hardware acceleration for Haiku's QEM
 </ul>
 -->
 
-<h4><img src="/images/Prefs_Devices.png"/>
+<h4><img src="/images/Prefs_Devices.svg" width="32" height="32" alt="">
 Devices preferences/Hardware manager
 </h4>
 <p>Haiku is meant to be an easy to use graphical operating system. It should
@@ -214,7 +214,7 @@ <h4><img src="/images/Prefs_Devices.png"/>
 	<li>Expected outcome: finalized version of Devices application, showing extra information about devices, including but not limited to the driver in use for each device.</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Other applications</h4>
 <p>There are many open source 3rd party applications for Haiku that could use improvements. Whether it is resolving bugs, adding features, updating the coding style, updating them to use the Locale and Layout Kits, or anything else imaginable! Writing applications from scratch is also possible.</p>
 
 <ul>
@@ -236,7 +236,7 @@ <h4><img src="/images/App_Generic_32.png"/>Other applications</h4>
 <a id="drivers" name="drivers"></a>
 <h3>Drivers</h3>
 
-<h4><img src="/images/webcam.png"/>USB Webcam support</h4>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">USB Webcam support</h4>
 
 <p>Haiku lacks support for WebCams following the UVC (USB Video Class) specification. There is an
 existing driver, but it is not working. The goal of this project is to investigate problems in the
@@ -250,7 +250,7 @@ <h4><img src="/images/webcam.png"/>USB Webcam support</h4>
 	<li>Possible mentors: PulkoMandy</li>
 </ul>
 
-<h4><img src="/images/webcam.png"/>USB Audio 2.0 support</h4>
+<h4><img src="/images/App_CodyCam.svg" width="32" height="32" alt="">USB Audio 2.0 support</h4>
 
 <p>Haiku has a driver for USB Audio sound cards, but it implements only version 1 of the
 specification. The goal of this project is to add support for USB Audio 2.0, allowing to handle
@@ -265,7 +265,7 @@ <h4><img src="/images/webcam.png"/>USB Audio 2.0 support</h4>
 </ul>
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 ACPI Video Extensions
 </h4>
 
@@ -282,7 +282,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- REMOVED; need investigation, possibly easier to use DragonFlyBSD's compatibility layer to get all drivers from Linux
-<h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Nouveau / PSCNV port</h4>
 <p>
 Haiku currently doesn't have a driver for NVidia video cards, and falls back to VESA for those. While our VESA driver is reasonably fast, it can't set the native display resolution on all systems, leading to a suboptimal Haiku experience.</p>
 <p>
@@ -296,7 +296,7 @@ <h4><img src="/images/App_Generic_32.png"/>Nouveau / PSCNV port</h4>
 -->
 
 
-<h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
+<h4><img src="/images/Misc_OtherRenderer.svg" width="32" height="32" alt="">GPU acceleration support</h4>
 <p>
 Haiku does not currently support GPU acceleration, for 3D or otherwise. Reusing
 most of the DRM drivers from Linux, and Mesa's Gallium userspace components,
@@ -326,7 +326,7 @@ <h4><img src="/images/Misc_OtherRenderer.png"/>GPU acceleration support</h4>
 <a id="kernel" name="kernel"></a>
 <h3>Kernel</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Power Management
 </h4>
 
@@ -343,7 +343,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: improved power management in Haiku code (applications, drivers, ...) with benchmarks to measure the results (this may involve also developping the tools needed for benchmarking)</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improving the btrfs filesystem
 </h4>
 <p>Haiku has great support for its own file system, but most others are only
@@ -374,7 +374,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>Adding write support for more filesystems</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Adding write support for more filesystems</h4>
 
 <h5>Idea description</h5>
 
@@ -405,7 +405,7 @@ <h5>Further details</h5>
 </ul>
 
 <!-- Removed for now, we have enough filesystems
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Adding a new filesystem to Haiku
 </h4>
 <p>Haiku has great support for its own file system, but is completely missing support for some other filesystems. It is way better for interoperability with other systems to be able to read and write to these disks.</p>
@@ -424,7 +424,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Filesystems benchmarking and stress-test
 </h4>
 
@@ -450,7 +450,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 
 <!-- Removed for now
-<h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process Context Identifiers (PCID)</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">x86-64: Implement support for Process Context Identifiers (PCID)</h4>
 
 <p>on Intel CPUs. The feature tags TLB entries with the Id of the address space and allows to
 avoid TLB invalidation on the context switch, it is available only on x86-64.</p>
@@ -468,7 +468,7 @@ <h4><img src="/images/App_Generic_32.png"/>x86-64: Implement support for Process
 !-->
 
 
-<h4><img src="/images/App_Generic_32.png"/>ARM MMU support</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">ARM MMU support</h4>
 
 <p>The ARM ports of Haiku (for both 32 and 64 bit systems) are currently not bootable. The main issue appears to be missing or incorrect implementation of memory management.
 Since the system is not booting, this blocks any other progress on the ARM port. The goal of this project is to investigate and fix these problems to get the ARM port booting further.</p>
@@ -486,7 +486,7 @@ <h4><img src="/images/App_Generic_32.png"/>ARM MMU support</h4>
 
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Unify File System Caches</h4>
 
 <p>
 The Haiku kernel provides two kinds of caches for use by file system implementations: the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/file_cache.cpp">file cache</a> and the <a href="https://cgit.haiku-os.org/haiku/tree/src/system/kernel/cache/block_cache.cpp">block cache</a>. The file cache caches data at the "file" level, while the block cache is used at the "block" level and is used for on-disk structures as well as file data.</p>
@@ -513,7 +513,7 @@ <h4><img src="/images/App_Generic_32.png"/>Unify File System Caches</h4>
 <h3>Network</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Bluetooth Stack Improvements
 </h4>
 <p>Haiku's Bluetooth stack implements a basic subset of general Bluetooth functionality. This functionality needs to be
@@ -531,7 +531,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: the Bluetooth stack can be used for more than just pairing devices. For example, bluetooth audio or bluetooth HID drivers can be used.</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Integrate our PPP implementation
 </h4>
 <p>Finish porting the PPP implementation to our new network stack. Add phone-line modem support, including HDLC
@@ -548,7 +548,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!--
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Stream Control Transmission Protocol (SCTP)
 </h4>
 <p>Implement and test SCTP, a message based transport layer protocol similar to TCP and UDP. It should comply with current IP and IPv6 implementations and provide similar programming API as BSD.</p>
@@ -557,7 +557,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 IPv6 finalization and stabilization
 </h4>
 <p>
@@ -583,7 +583,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 	<li>Expected outcome: IPv6 auto-configuration works, and it is possible to access website and other internet services over IPv6</li>
 </ul>
 
-<h4><img src="/images/App_Generic_32.png"/>MDNS / Bonjour / Avahi network discovery</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">MDNS / Bonjour / Avahi network discovery</h4>
 
 <h5>Idea description</h5>
 
@@ -607,7 +607,7 @@ <h5>Further details</h5>
 <h3>User Interface</h3>
 
 <!-- removed: needs to be thought out on the mailing list a little better
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Preferences GUI refactoring
 </h4>
 <p>
@@ -630,7 +630,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 <!-- Removed: done in 2024?
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Tracker query window user interface rework
 </h4>
 
@@ -654,7 +654,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 -->
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modular edit view (BIG)
 </h4>
 
@@ -695,7 +695,7 @@ <h3>Media</h3>
 -->
 
 <!-- needs to be discussed more; working on a MediaKit2 may make more sense. (Didn't Dan0 have MediaKit2?)
-<h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Add subtitle support to the Media Kit</h4>
 
 <p>Haiku "media" applications rely on a framework called the Media Kit. This
 provides a unified API to handle audio and video streams, including codec
@@ -730,7 +730,7 @@ <h4><img src="/images/App_Generic_32.png"/>Add subtitle support to the Media Kit
 -->
 
 <!-- Mentors wanted
-<h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer Plugin API</h4>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">Complete and Finalize the MediaPlayer Plugin API</h4>
 
 <p>The MediaPlayer app included in Haiku is able to play most of the media
 formats around. To be able to do that it includes a monolithic framework that
@@ -767,7 +767,7 @@ <h4><img src="/images/App_Generic_32.png"/>Complete and Finalize the MediaPlayer
 
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Implement system wide and application level input/output chooser
 </h4>
 <p>
@@ -793,7 +793,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 <h3>Ports</h3>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Porting the Go Programming Language to Haiku
 </h4>
 
@@ -836,7 +836,7 @@ <h5>Existing work</h5>
 <a id="other" name="other"></a>
 <h3>Other</h3>
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Improvements to Haiku-format coding style checker
 </h4>
 <p>Haiku has its own <a href="/development/coding-guidelines/">coding guidelines</a>
@@ -850,7 +850,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Add Haiku support to Allegro 5.0
 </h4>
 <p>Allegro is a gaming library. Older version (4.4) did support Haiku, but this
@@ -870,7 +870,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 
 <!-- REMOVED: needs more thinking on Haiku side to decide on a plan for this.
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Modify the app_server to support compositing
 </h4>
 <p>This would be a step towards faster/smoother scrolling, window positioning and drawing. Once compositing is in place, it would also be possible to create Compiz-like effects in Haiku, eg. drop shadows, transparent windows, content previews, and window animations.</p>
@@ -881,7 +881,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 -->
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 Multiple monitors output in app_server
 </h4>
 <p>app_server is Haiku's graphics server and the equivalent of X11 or Wayland on other UNIX systems. It currently supports only one video output, but should be able to do more.</p>
@@ -896,7 +896,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 	Complex font rendering in app_server
 </h4>
 <p>app_server is the graphics server in Haiku. It handles the rendering and
@@ -922,7 +922,7 @@ <h4><img src="/images/App_Generic_32.png"/>
 </ul>
 
 <!--
-<h4><img src="/images/App_Generic_32.png"/>
+<h4><img src="/images/App_Generic.svg" width="32" height="32" alt="">
 RTL languages support in interface kit
 </h4>
 <p>The interface kit is the part of the API taking care of everything drawing related: windows, buttons, and other widgets. It is not currently able to display right-to-left languages (such as arabic) properly, making Haiku unusable for a lot of people.</p>
diff --git a/content/contact.html b/content/contact.html
index 06dce185b..9c8fa653f 100644
--- a/content/contact.html
+++ b/content/contact.html
@@ -16,17 +16,17 @@ <h2>Contacting the Haiku Community</h2>
 <tr>
 <td style="width: 50%;">
 <ul>
-<img src='/images/App_Chat_32.png' style='vertical-align: middle;'> <a href="https://discuss.haiku-os.org">Community Forums</a><br /><br />
-<img src='/images/App_Vision_32.png' style='vertical-align: middle;'> <a href="/community/irc">IRC Channels</a><br /><br />
-<img src='/images/File_HTML_32.png' style='vertical-align: middle;'> <a href="/blog">Haiku Blog-O-Sphere</a><br /><br />
-<img src='/images/App_People_32.png'  style='vertical-align: middle;'> Conferences: <a href="/conference">List</a> | <a href="/conference/map">Map</a> | <a href="/conference/calendar">Calendar</a>
+<img src="/images/App_Chat.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="https://discuss.haiku-os.org">Community Forums</a><br /><br />
+<img src="/images/App_Vision.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/irc">IRC Channels</a><br /><br />
+<img src="/images/File_HTML.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/blog">Haiku Blog-O-Sphere</a><br /><br />
+<img src="/images/App_People.svg" style="vertical-align: middle;" width="32" height="32" alt=""> Conferences: <a href="/conference">List</a> | <a href="/conference/map">Map</a> | <a href="/conference/calendar">Calendar</a>
 </ul>
 </td>
 <td style="margin-top:10px; width: 50%;">
 <ul>
-<img src='/images/generic-file_32.png' style='vertical-align: middle;'> <a href="/community/social-media">Social Media</a><br /><br />
-<img src='/images/Folder_mail_32.png' style='vertical-align: middle;'> <a href="/community/ml">Mailing Lists</a><br /><br />
-<img src='/images/File_Text_32.png' style='vertical-align: middle;'> <a href="/documents/">Documents for developers and users</a><br /><br />
+<img src="/images/File_Generic.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/social-media">Social Media</a><br /><br />
+<img src="/images/Folder_mail.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/community/ml">Mailing Lists</a><br /><br />
+<img src="/images/File_Text.svg" style="vertical-align: middle;" width="32" height="32" alt=""> <a href="/documents/">Documents for developers and users</a><br /><br />
 </ul>
 </td>
 </tr>
diff --git a/content/development/learning_to_program_with_haiku.html b/content/development/learning_to_program_with_haiku.html
index 0e6ece9dc..261775a9e 100644
--- a/content/development/learning_to_program_with_haiku.html
+++ b/content/development/learning_to_program_with_haiku.html
@@ -50,11 +50,11 @@ <h2>Lesson 1</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_1.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-01-20_calling_all_haiku_developer_wannabes#comments">
-		<img src='/images/App_Chat_32.png' title='Comments' alt='Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -68,11 +68,11 @@ <h2>Lesson 2</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_2.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-01-23_programming_lesson_2#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -88,11 +88,11 @@ <h2>Lesson 3</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_3.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-01-30_programming_lesson_3#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -108,11 +108,11 @@ <h2>Lesson 4: If, For, And, Not, Or</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_4.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-02-06_lesson_4_if_and_not_or#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -129,11 +129,11 @@ <h2>Lesson 5: Arrays, Strings, and Pointers</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_5.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-02-13_lesson_5_arrays_strings_and_pointers#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -147,11 +147,11 @@ <h2>Unit Review: 1 - 5</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Unit_1_Review.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-06_whole_lotta_lessons_goin#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -168,11 +168,11 @@ <h2>Lesson 6: More Loops and Conditions	</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_6.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-02-20_lesson_6_more_loops_and_conditions#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -188,11 +188,11 @@ <h2>Lesson 7: Losing My Memory</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_7.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-02-27_lesson_7_losing_my_memory#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -206,11 +206,11 @@ <h2>Lesson 8</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_8.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-06_whole_lotta_lessons_goin#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -224,11 +224,11 @@ <h2>Lesson 9</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_9.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-06_whole_lotta_lessons_goin#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -242,15 +242,15 @@ <h2>Unit Review: 6 - 9</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Unit_2_Review.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-06_whole_lotta_lessons_goin#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Unit_2_Review_Answers.pdf">
-		<img src='/images/Misc_Marker_32.png' title='Review Answers' alt='Review Answers'><br />Review Answers</a>
+		<img src="/images/Misc_Marker.svg" width="32" height="32" title="Review Answers" alt="Review Answers"><br />Review Answers</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -268,11 +268,11 @@ <h2>Lesson 10: More Pointers and the Command Line</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_10.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-13_lesson_10_more_pointers_and_command_line#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -291,11 +291,11 @@ <h2>Lesson 11: More Data Structures and Types</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_11.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-20_lesson_11_more_data_structures_and_types#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -313,11 +313,11 @@ <h2>Lesson 12: OOPs I Did It Again!</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_12.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-03-28_lesson_12_oops_i_did_it_again#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -335,11 +335,11 @@ <h2>Lesson 13: Programming With Class(es)</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_13.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-04-04_lesson_13_programming_classes#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -353,15 +353,15 @@ <h2>Unit Review: 10 - 13</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Unit_3_Review.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-04-04_lesson_13_programming_classes#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Unit_3_Review_Answers.pdf">
-		<img src='/images/Misc_Marker_32.png' title='Review Answers' alt='Review Answers'><br />Review Answers</a>
+		<img src="/images/Misc_Marker.svg" width="32" height="32" title="Review Answers" alt="Review Answers"><br />Review Answers</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -377,11 +377,11 @@ <h2>Lesson 14: Our First GUI Program</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_14.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-04-14_lesson_14_our_first_gui_program#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -400,15 +400,15 @@ <h2>Lesson 15: The Haiku API at 10,000 Feet</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_15.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_15ClickMe.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-04-20_lesson_15_haiku_api_10000_feet#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -425,11 +425,11 @@ <h2>Lesson 16: Locked and Overloaded</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_16.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-04-27_lesson_16_locked_and_overloaded#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -446,15 +446,15 @@ <h2>Lesson 17: What's on the Menu</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_17.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_17MenuColors.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-05-10_lesson_17_whats_menu#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 
 <br style='clear:both' /><br /><br /><br />
@@ -473,15 +473,15 @@ <h2>Lesson 18: Working With Lists</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_18.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_18ListTitle.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-05-19_lesson_18_working_lists#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <!--
@@ -500,15 +500,15 @@ <h2>Lesson 19: Resources and Pictures</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_19.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_19Emo.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-05-25_lesson_19_resources_and_pictures#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <!--
@@ -526,15 +526,15 @@ <h2>Lesson 20: All About Storage</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_20.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_20ListDir.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-06-02_lesson_20_all_about_storage#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <!--
@@ -550,14 +550,12 @@ <h2>Lesson 21: Reading and Writing Files</h2>
    series which will be developed over the course of several lessons.
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
-       <a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_21.pdf">
-               <img src='/images/pdf_32.png'
-title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+    <a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_21.pdf">
+        <img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
-       <a href="/blog/darkwyrm/2010-06-11_lesson_21_reading_and_writing_files#comments">
-               <img src='/images/App_Chat_32.png'
-title='View Comments' alt='View Comments'><br />View Comments</a>
+    <a href="/blog/darkwyrm/2010-06-11_lesson_21_reading_and_writing_files#comments">
+        <img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br /><!--
 		===================
@@ -569,18 +567,16 @@ <h2>Lesson 22: Designing a GUI</h2>
    Usability is one of my pet topics. Although less so now that in years past, it is all-too-often ignored or not given enough priority. This lesson scratches the surface from a developer's point of view. I'm no usability expert, but I do know a thing or two. This lesson is a must-read for any budding developer, and by the end of it, we will have a good real-world program to show off which is just shy of being ready for a release.
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
-       <a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_22.pdf">
-               <img src='/images/pdf_32.png'
-title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+    <a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_22.pdf">
+        <img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/learning_to_program/Learning_to_Program_With_Haiku_22HaikuFortune.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
-       <a href="/blog/darkwyrm/2010-06-15_lesson_22_designing_gui#comments">
-               <img src='/images/App_Chat_32.png'
-title='View Comments' alt='View Comments'><br />View Comments</a>
+    <a href="/blog/darkwyrm/2010-06-15_lesson_22_designing_gui#comments">
+        <img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <!--
@@ -599,14 +595,12 @@ <h2>Lesson 23: Polish and Packaging Our Project</h2>
 	code licensing, and packaging a program for Haiku.
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
-       <a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_23.pdf">
-               <img src='/images/pdf_32.png'
-title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+    <a href="/files/learning_to_program/Learning_to_Program_With_Haiku_Lesson_23.pdf">
+        <img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
-       <a href="/blog/darkwyrm/2010-06-23_lesson_23_polish_and_packaging_our_project#comments">
-               <img src='/images/App_Chat_32.png'
-title='View Comments' alt='View Comments'><br />View Comments</a>
+    <a href="/blog/darkwyrm/2010-06-23_lesson_23_polish_and_packaging_our_project#comments">
+        <img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 
diff --git a/content/development/programming_with_haiku.html b/content/development/programming_with_haiku.html
index 099175e0f..cf9b5313c 100644
--- a/content/development/programming_with_haiku.html
+++ b/content/development/programming_with_haiku.html
@@ -19,11 +19,11 @@ <h2>Lesson 1</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_1.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-09-08_new_series_lessons_programming_haiku#comments">
-		<img src='/images/App_Chat_32.png' title='Comments' alt='Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 2</h2>
@@ -32,11 +32,11 @@ <h2>Lesson 2</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_2.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-09-23_programming_haiku_lesson_2#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 3</h2>
@@ -45,11 +45,11 @@ <h2>Lesson 3</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_3.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-09-30_programming_haiku_lessons_35#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 4: Source Control</h2>
@@ -58,11 +58,11 @@ <h2>Lesson 4: Source Control</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_4.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-09-30_programming_haiku_lessons_35#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 5</h2>
@@ -71,11 +71,11 @@ <h2>Lesson 5</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_5.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-09-30_programming_haiku_lessons_35#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 6: ....</h2>
@@ -92,11 +92,11 @@ <h2>Lesson 12: All About Attributes</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_12.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-10-26_lesson_12_all_about_attributes#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lucky Lesson 13: Queries</h2>
@@ -105,11 +105,11 @@ <h2>Lucky Lesson 13: Queries</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_13.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-11-18_lucky_lesson_13_queries#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 14: I Node What You Did Last Summer</h2>
@@ -118,11 +118,11 @@ <h2>Lesson 14: I Node What You Did Last Summer</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_14.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-11-26_lesson_14_i_node_what_you_did_last_summer#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 15: Making a New File Type</h2>
@@ -131,11 +131,11 @@ <h2>Lesson 15: Making a New File Type</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_15.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2010-12-12_lesson_15_making_new_file_type#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 16: Fonts</h2>
@@ -144,11 +144,11 @@ <h2>Lesson 16: Fonts</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_16.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-01-09_lesson_16_fonts#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Unit Review: 6 - 15</h2>
@@ -156,11 +156,11 @@ <h2>Unit Review: 6 - 15</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Unit_2_(6-15)_Review.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-01-09_lesson_16_fonts#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 17: Writing a New Control, Part I</h2>
@@ -169,11 +169,11 @@ <h2>Lesson 17: Writing a New Control, Part I</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_17.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-01-31_lesson_17_writing_new_control_part_i#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 18: Application Scripting</h2>
@@ -182,15 +182,15 @@ <h2>Lesson 18: Application Scripting</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_18.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Scripting Explorer.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-03-16_lesson_18_application_scripting#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 19: Deeper in Application Scripting</h2>
@@ -199,11 +199,11 @@ <h2>Lesson 19: Deeper in Application Scripting</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_19.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-04-13_lesson_19_deeper_application_scripting#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 20: Drag and Drop</h2>
@@ -212,11 +212,11 @@ <h2>Lesson 20: Drag and Drop</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_20.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-05-17_lesson_20_drag_and_drop#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 21: Replicants</h2>
@@ -225,11 +225,11 @@ <h2>Lesson 21: Replicants</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_21.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-07-06_programming_haiku_lesson_21_replicants#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 22: A First (Bigger) Project</h2>
@@ -238,15 +238,15 @@ <h2>Lesson 22: A First (Bigger) Project</h2>
 </p>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_Lesson_22.pdf">
-		<img src='/images/pdf_32.png' title='Download PDF' alt='Download PDF' ><br />Download PDF</a>
+		<img src="/images/File_PDF.svg" width="32" height="32" title="Download PDF" alt="Download PDF"><br />Download PDF</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/files/programming_with_haiku/Programming_with_Haiku_22QuickEdit.zip">
-		<img src='/images/ide_project_32.png' title='Download Source Code' alt='Download Source Code' ><br />Download<br />Source Code</a>
+		<img src="/images/File_IDE_Project.svg" width="32" height="32" title="Download Source Code" alt="Download Source Code"><br />Download<br />Source Code</a>
 </div>
 <div style='float: left; text-align: center; margin: 0px 4px 0px 4px;'>
 	<a href="/blog/darkwyrm/2011-12-28_lesson_22_first_bigger_project#comments">
-		<img src='/images/App_Chat_32.png' title='View Comments' alt='View Comments'><br />View Comments</a>
+		<img src="/images/App_Chat.svg" width="32" height="32" title="View Comments" alt="View Comments"><br />View Comments</a>
 </div>
 <br style='clear:both' /><br /><br /><br />
 <h2>Lesson 23: ...... again</h2>
diff --git a/content/guides/_index.md b/content/guides/_index.md
index 4a7d92008..6667953c2 100644
--- a/content/guides/_index.md
+++ b/content/guides/_index.md
@@ -6,42 +6,42 @@ tags = []
 +++
 
 <p>
-<h4><a name="installing_haiku"></a><img src='/images/installer_32.png'> <a href='/guides/installing'>Installing Haiku</a></h4>
+<h4><a name="installing_haiku"></a><img src="/images/App_Installer.svg" width="32" height="32" alt=""> <a href="/guides/installing">Installing Haiku</a></h4>
 Haiku can easily be installed pre-built images from <a href="https://www.haiku-os.org/get-haiku/">the Haiku website</a> or images that <a href="#build_from_source">you can build yourself</a>.
 </p>
 
 <p>
-<h4><a name="haiku_virtualization"></a><img src='/images/App_Generic_32.png'> <a href='/guides/virtualizing'>Virtualizing Haiku</a></h4>
+<h4><a name="haiku_virtualization"></a><img src="/images/App_Generic.svg" width="32" height="32" alt=""> <a href='/guides/virtualizing'>Virtualizing Haiku</a></h4>
 Installing Haiku in a virtual machine can be useful if you want to try out or develop for Haiku.</p>
 </p>
 
 <p>
-<h4><a name="daily_tasks"></a><img src='/images/Server_Syslog_32.png'> <a href='/guides/daily-tasks'>Daily Tasks</a></h4>
+<h4><a name="daily_tasks"></a><img src="/images/Server_Syslog.svg" width="32" height="32" alt=""> <a href="/guides/daily-tasks">Daily Tasks</a></h4>
 A list of example tasks users may want to perform under Haiku such as connecting to a wireless network, installing software packages, enabling network services such as ssh, or backing up your stuff.
 </p>
 
 <p>
-<h4><a name="troubleshooting"></a><img src='/images/Alert_Stop_32.png'> <a href='/guides/troubleshooting'>Troubleshooting</a></h4>
+<h4><a name="troubleshooting"></a><img src="/images/Alert_Stop.svg" width="32" height="32"> <a href="/guides/troubleshooting">Troubleshooting</a></h4>
 Problems do occur with computers.  Various troubleshooting techniques for an array of serious issues.
 </p>
 
 <hr>
 
-<h4><a name="build_from_source"></a><img src='/images/ide_project_32.png'> <a href='/guides/building'>Building Haiku</a></h4>
+<h4><a name="build_from_source"></a><img src="/images/File_IDE_Project.svg" width="32" height="32" alt=""> <a href='/guides/building'>Building Haiku</a></h4>
 <p>Building Haiku from sources is a surprisingly simple process which allows developers to get started quickly developing on Haiku and allowing end users to experiment with the latest Haiku sources.
 </p>
 
 <p>
-<h4><a name="booting_haiku"></a><img src='/images/System_Kernel_32.png'> <a href='/guides/booting'>Booting Haiku</a></h4>
+<h4><a name="booting_haiku"></a><img src="/images/System_Kernel.svg" width="32" height="32" alt=""> <a href='/guides/booting'>Booting Haiku</a></h4>
 Various methods and procedures to boot Haiku.
 </p>
 
 <p>
-<h4><a name="efi_booting_haiku"></a><img src='/images/Website_Edit_Profile_32.png'> <a href='/guides/uefi_booting'>UEFI Booting Haiku</a></h4>
+<h4><a name="efi_booting_haiku"></a><img src="/images/Website_Edit_Profile.svg" width="32" height="32" alt=""> <a href="/guides/uefi_booting">UEFI Booting Haiku</a></h4>
 Booting Haiku via UEFI on hardware that supports it.
 </p>
 
 <p>
-<h4><a name="network_booting_haiku"></a><img src='/images/Prefs_Network_32.png'> <a href='/guides/network_booting'>Network Booting Haiku</a></h4>
+<h4><a name="network_booting_haiku"></a><img src="/images/Prefs_Network.svg" width="32" height="32" alt=""> <a href="/guides/network_booting">Network Booting Haiku</a></h4>
 Booting Haiku over a local network.
 </p>
diff --git a/content/guides/booting.md b/content/guides/booting.md
index 8b3c65d50..19ee5c24b 100644
--- a/content/guides/booting.md
+++ b/content/guides/booting.md
@@ -7,7 +7,7 @@ tags = ["booting","grub","disk server"]
 
 There are a wide range of options and configurations available to boot Haiku, from from modifying the boot sector, to configuring (and possibly installing) a boot manager. For an overview of the various booting options available to Haiku, please check out [this page of the Haiku User Guide](/docs/userguide/en/bootloader.html)
 
-## ![folder](/images/folder_config_32.png) Using Makebootable
+## <img src="/images/Folder_config.svg" width="32" height="32" alt="folder"> Using Makebootable
 
 `makebootable` is a low-level Haiku tool to enable x86 MBR (legacy bios) systems to boot from the active Haiku partition.
 
@@ -43,7 +43,7 @@ Makebootable is included with Haiku. However, it can also be accessed from syste
 
 <pre class="terminal">makebootable /dev/disk/...</pre>
 
-## ![harddisk](/images/harddisk_32.png) Configuring GRUB boot manager
+## <img src="/images/Device_Harddisk.svg" width="32" height="32" alt="harddisk"> Configuring GRUB boot manager
 
 GRUB is a common boot manager used on other open-source operating systems. (Including Linux)
 
diff --git a/content/guides/building/get-source-git.md b/content/guides/building/get-source-git.md
index fe8472028..a84e05ea7 100644
--- a/content/guides/building/get-source-git.md
+++ b/content/guides/building/get-source-git.md
@@ -7,7 +7,7 @@ tags = []
 
  <!-- NOTE: This article should be eventually split in two parts. -->
 
-<span class="right"><img src='/images/archive_64.png'></span>
+<span class="right"><img src="/images/File_Archive.svg" width="64" height="64" alt=""></span>
 
 Haiku's source code is currently being hosted on a
 <a href="http://git-scm.com/" target="_blank">Git-based repository</a> using <a href="https://gerritcodereview.com" target="_blank">Gerrit</a>.
diff --git a/content/news/2008-04-28_call_to_arms_haiku_code_drive_2008.html b/content/news/2008-04-28_call_to_arms_haiku_code_drive_2008.html
index 9b6f26bc1..328ba4ed9 100644
--- a/content/news/2008-04-28_call_to_arms_haiku_code_drive_2008.html
+++ b/content/news/2008-04-28_call_to_arms_haiku_code_drive_2008.html
@@ -9,7 +9,7 @@
     <div class="field field-type-text field-field-body">
     <div class="field-items">
             <div class="field-item odd">
-                    <img src="/themes/shijin/icons/people_64.png" align="right" border="0" hspace="20" vspace="5" alt="The Haiku Community" title="The Haiku Community" height="64" width="64"><p><a href="/news/2008-04-21/haiku_gets_five_students_spots_for_gsoc_2008">Google assigned Haiku five student slots</a> for the Google Summer of Code 2008, so we had to narrow down our final choice from the many high quality student applications. This was tough: many good applications had to be left out, and we really hate leaving people out, particularly those who had shown an interest in Haiku. So we started entertaining the idea of sponsoring a few of these students ourselves. Today we introduce you to the Haiku Code Drive 2008, a program designed to raise funds from the community in order to sponsor students to produce code for Haiku. This is how it's going to work.</p>
+                    <img src="/images/App_People.svg" align="right" border="0" hspace="20" vspace="5" alt="The Haiku Community" title="The Haiku Community" height="64" width="64"><p><a href="/news/2008-04-21/haiku_gets_five_students_spots_for_gsoc_2008">Google assigned Haiku five student slots</a> for the Google Summer of Code 2008, so we had to narrow down our final choice from the many high quality student applications. This was tough: many good applications had to be left out, and we really hate leaving people out, particularly those who had shown an interest in Haiku. So we started entertaining the idea of sponsoring a few of these students ourselves. Today we introduce you to the Haiku Code Drive 2008, a program designed to raise funds from the community in order to sponsor students to produce code for Haiku. This is how it's going to work.</p>
 
 <p>We contacted all the GSoC students that applied for Haiku but did not make it, and asked them if they were interested in carrying out their proposed project for a $2,500 stipend each. From their response, we have created this <a href="/community/haiku-code-drive-2008/applications">list of students and their projects</a>; these are the candidates for the Haiku Code Drive 2008 program. Now we are asking you, the Haiku community, to fund the program by making donations. We will then hold a public poll so that the community can influence which candidates/projects they want to sponsor. At the end of the poll/donation period, we will determine how many and which of the students will be sponsored based on the donated funds and the results of the poll. Check out all the <a href="/community/haiku-code-drive-2008#calendar">details of the program</a> here, including a <a href="/community/haiku-code-drive-2008#calendar">timeline with tentative dates</a>.</p>
 
diff --git a/content/news/2021-07-26_media_release_the_haiku_project_celebrates_the_release_of_beta_3.md b/content/news/2021-07-26_media_release_the_haiku_project_celebrates_the_release_of_beta_3.md
index 55a23cc50..ac0cf16c2 100644
--- a/content/news/2021-07-26_media_release_the_haiku_project_celebrates_the_release_of_beta_3.md
+++ b/content/news/2021-07-26_media_release_the_haiku_project_celebrates_the_release_of_beta_3.md
@@ -71,7 +71,7 @@ For media enquiries, please contact:
 contact@haiku-os.org  
 
 <a href="https://www.haiku-os.org/get-haiku/"><img src="/images/GET_HAIKU.png"/></a>
-<a href="/files/R1_Beta3_Press_Kit.zip"><img src="/images/download_32.png"/>**Download press kit here**</a>
+<a href="/files/R1_Beta3_Press_Kit.zip"><img src="/images/download.svg" width="32" height="32" alt="">**Download press kit here**</a>
 
 ## NOTES TO EDITORS
 Note that screenshots, logos and other resources are included in the press kit for this
diff --git a/content/news/2021-12-01_media_release_the_haiku_project_and_freewear_launch_official_haiku_merchandise.md b/content/news/2021-12-01_media_release_the_haiku_project_and_freewear_launch_official_haiku_merchandise.md
index 94db1f86c..63f9a3621 100644
--- a/content/news/2021-12-01_media_release_the_haiku_project_and_freewear_launch_official_haiku_merchandise.md
+++ b/content/news/2021-12-01_media_release_the_haiku_project_and_freewear_launch_official_haiku_merchandise.md
@@ -20,4 +20,4 @@ For media enquiries, please contact:
 contact(@)haiku-os.org (The Haiku Project)   
 admin(@)freewear.org (FreeWear)  
 
-<a href="/files/Haiku and Freewear Press Kit.zip"><img src="/images/download_32.png"/>**Download press kit here**</a> 
\ No newline at end of file
+<a href="/files/Haiku and Freewear Press Kit.zip"><img src="/images/download.svg" width="32" height="32" alt="">**Download press kit here**</a> 
\ No newline at end of file
diff --git a/content/thank_you.html b/content/thank_you.html
index 7d9bc590e..9622d550c 100644
--- a/content/thank_you.html
+++ b/content/thank_you.html
@@ -5,7 +5,7 @@
 tags = []
 +++
 
-<p><img src="/themes/shijin/icons/people_64.png" align="right" border="0" hspace="20" vspace="5" alt="Thank you for your donation!" title="Thank you for your donation!" height="64" width="64">Thank you very much for showing your support for Haiku. A receipt for your donation has been sent to your mailbox.</p>
+<p><img src="/images/App_People.svg" align="right" border="0" hspace="20" vspace="5" alt="Thank you for your donation!" title="Thank you for your donation!" height="64" width="64">Thank you very much for showing your support for Haiku. A receipt for your donation has been sent to your mailbox.</p>
 
 <p>Being a project comprised of volunteers that work on Haiku in their spare time, contributions like yours make a great difference in advancing our cause of creating a free operating system for all to use. Your donation will be put to good use.</p>
 
diff --git a/static/files/App_HaikuDepot_32.png b/static/files/App_HaikuDepot_32.png
deleted file mode 100644
index 5a85f2304..000000000
Binary files a/static/files/App_HaikuDepot_32.png and /dev/null differ
diff --git a/static/images/Alert_Idea.svg b/static/images/Alert_Idea.svg
new file mode 100644
index 000000000..3a94d974d
--- /dev/null
+++ b/static/images/Alert_Idea.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.4687 0 0 .4375 32 36)" gradientUnits="userSpaceOnUse"><stop offset=".491" stop-color="#010000" stop-opacity=".267"/><stop offset="1" stop-color="#010000" stop-opacity="0"/></radialGradient><path d="M32 0C14 0 0 14 0 32s14 32 32 32 32-14 32-32S50 0 32 0" style="fill:url(#a)" transform="matrix(.7187 0 0 .3125 18 44)"/><path d="M40 51v5c0 3.45-3.47 6-8 6-4.54 0-8-2.55-8-6v-5" style="fill:none;stroke:#010000;stroke-width:4"/><radialGradient id="b" cx="0" cy="0" r="64" gradientTransform="matrix(.2158 .038 -.0246 .1394 27.903 52.23)" gradientUnits="userSpaceOnUse"><stop offset=".44" stop-color="#f2f2f2"/><stop offset=".641" stop-color="#8e8e8e"/><stop offset=".835" stop-color="#e1e1e1"/><stop offset="1" stop-color="#595959"/></radialGradient><path d="M40 51v5c0 3.45-3.47 6-8 6-4.54 0-8-2.55-8-6v-5" style="fill:url(#b)"/><path d="M43 43v2c0 4.75-4.95 9-11 9-6.06 0-11-4.25-11-9v-2m15 2c10.23-1.87 18-10.3 18-21-.01-12.07-9.86-22-22-22-12.15 0-22 9.93-22 22 0 10.7 7.76 19.13 18 21" style="fill:none;stroke:#010000;stroke-width:4"/><radialGradient id="c" cx="0" cy="0" r="64" gradientTransform="translate(24 16)scale(.4687)" gradientUnits="userSpaceOnUse"><stop offset=".194" stop-color="#fff"/><stop offset=".839" stop-color="#ffe500"/><stop offset="1" stop-color="#ffc800"/></radialGradient><path d="M43 43v2c0 4.75-4.95 9-11 9-6.06 0-11-4.25-11-9v-2" style="fill:url(#c)"/><radialGradient id="d" cx="0" cy="0" r="64" gradientTransform="translate(24 16)scale(.4687)" gradientUnits="userSpaceOnUse"><stop offset=".194" stop-color="#fff"/><stop offset=".839" stop-color="#ffe500"/><stop offset="1" stop-color="#ffc800"/></radialGradient><path d="M36 45c10.23-1.87 18-10.3 18-21-.01-12.07-9.86-22-22-22-12.15 0-22 9.93-22 22 0 10.7 7.76 19.13 18 21" style="fill:url(#d)"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="translate(24 16)scale(.4687)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe6a5"/><stop offset=".89" stop-color="#ffbb03"/><stop offset="1" stop-color="#ffbf00"/></radialGradient><path d="M32 48V34" style="fill:none;stroke:url(#e);stroke-width:4;stroke-linecap:round;stroke-linejoin:round"/><radialGradient id="f" cx="0" cy="0" r="64" gradientTransform="translate(24 16)scale(.4687)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe6a5"/><stop offset=".89" stop-color="#ffbb03"/><stop offset="1" stop-color="#ffbf00"/></radialGradient><path d="M28 28c0-3.23 1.73-6 4-6 2.26 0 4 2.77 4 6 0 3.22-1.74 6-4 6-2.27 0-4-2.78-4-6" style="fill:none;stroke:url(#f);stroke-width:4;stroke-linecap:round;stroke-linejoin:round"/><path d="M20 42c2.38 1.48 5.1 2.47 8 3 0 0-5 0-8-2z" style="fill:#010000"/><path d="M20 42c2.38 1.48 5.1 2.47 8 3 0 0-5 0-8-2z" style="fill:#010000" transform="matrix(-1 0 0 1 64 0)"/></svg>
\ No newline at end of file
diff --git a/static/images/Alert_Info.svg b/static/images/Alert_Info.svg
new file mode 100644
index 000000000..3fbdc8911
--- /dev/null
+++ b/static/images/Alert_Info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m36 42-4 22h4l10-10h3l7-7-10-5zm18 0c-5.53 0-10 2.46-10 5.5 0 3.03 4.47 5.5 10 5.5 5.52 0 10-2.47 10-5.5 0-3.04-4.48-5.5-10-5.5" style="fill:#000;fill-opacity:.3294"/><path d="M34 45V21l-13-5-11 6v3l4 3v11l-8 5v4l26 14 10-10v-4z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="25.16" x2="56.75" y1="-43.14" y2="-34.42" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#227aff"/><stop offset="1" stop-color="#0025e5"/></linearGradient><path d="M24 53V28l-14-6v3l4.03 3.26L14 48l-8-4v4l26 14v-5z" style="fill:url(#a)"/><linearGradient id="b" x1="46.77" x2="65.47" y1="-64.5" y2="-60.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000081"/><stop offset="1" stop-color="#0909b7"/></linearGradient><path d="M32 57v5l10-10v-4z" style="fill:url(#b)"/><linearGradient id="c" x1="46.77" x2="65.47" y1="-64.5" y2="-60.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000081"/><stop offset="1" stop-color="#0909b7"/></linearGradient><path d="m24 53 10-8V21l-10 7z" style="fill:url(#c)"/><linearGradient id="d" x1="17.32" x2="29.9" y1="37.58" y2="31.35" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#050ec5"/><stop offset="1" stop-color="#062fe3"/></linearGradient><path d="m42 48-8-3-10 8 12.4.03z" style="fill:url(#d)"/><linearGradient id="e" x1="-8.63" x2="12.76" y1="21.52" y2="10.9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#67b5ff"/><stop offset="1" stop-color="#3b79f6"/></linearGradient><path d="m24 53 8 4 4.4-3.97z" style="fill:url(#e)"/><linearGradient id="f" x1="-8.63" x2="12.76" y1="21.52" y2="10.9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#67b5ff"/><stop offset="1" stop-color="#3b79f6"/></linearGradient><path d="m6 44 8 4v-9z" style="fill:url(#f)"/><radialGradient id="g" cx="0" cy="0" r="64" gradientTransform="matrix(.3125 0 0 .1406 30 22)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0530d1"/><stop offset="1" stop-color="#67b5ff"/></radialGradient><path d="m21 16-11 6 14 6 10-7z" style="fill:url(#g)"/><path d="M22 2c-5.53 0-10.01 4.47-10 10 0 5.52 4.47 10 10 10 5.52 0 10-4.48 10-10 0-5.53-4.48-10-10-10z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="h" cx="0" cy="0" r="64" gradientTransform="translate(19 9.43)scale(.2031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3787ff"/><stop offset=".337" stop-color="#1b76ff"/><stop offset=".859" stop-color="#000081"/><stop offset="1" stop-color="#031d8c"/></radialGradient><path d="M22 2c-5.53 0-10.01 4.47-10 10 0 5.52 4.47 10 10 10 5.52 0 10-4.48 10-10 0-5.53-4.48-10-10-10" style="fill:url(#h)"/><radialGradient id="i" cx="0" cy="0" r="64" gradientTransform="matrix(.0527 0 0 -.0527 19 9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#3787ff"/></radialGradient><path d="M19 5.62c-1.87 0-3.38 1.51-3.37 3.38 0 1.86 1.5 3.37 3.37 3.37s3.37-1.51 3.37-3.37c0-1.87-1.51-3.38-3.37-3.38" style="fill:url(#i)"/></svg>
\ No newline at end of file
diff --git a/static/images/Alert_Info_32.png b/static/images/Alert_Info_32.png
deleted file mode 100644
index 05b4fe898..000000000
Binary files a/static/images/Alert_Info_32.png and /dev/null differ
diff --git a/static/images/Alert_Stop.svg b/static/images/Alert_Stop.svg
new file mode 100644
index 000000000..9ca6e9430
--- /dev/null
+++ b/static/images/Alert_Stop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m55 64 8-8-8-4-15 2-4 4 4 4zM28 52c-6.63 0-12 2.68-12 6 0 3.31 5.37 6 12 6 6.62 0 12-2.69 12-6 0-3.32-5.38-6-12-6" style="fill:#010101;fill-opacity:.4666"/><path d="M24 40c-5.53 0-10 4.47-10 10 0 5.52 4.47 10 10 10 5.52 0 10-4.48 10-10 0-5.53-4.48-10-10-10z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="translate(20.8 47)scale(.2281)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".25" stop-color="#ff3930"/><stop offset=".815" stop-color="maroon"/><stop offset="1" stop-color="#bf0000"/></radialGradient><path d="M24 40c-5.53 0-10 4.47-10 10 .01 5.52 4.47 10 10 10 5.52 0 10-4.48 10-10-2 2-8-1-12-3 0 0 0-3 2-7" style="fill:url(#a)"/><radialGradient id="b" cx="0" cy="0" r="64" gradientTransform="translate(20.8 47)scale(.2281)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff756e"/><stop offset=".301" stop-color="#d50f05"/><stop offset=".815" stop-color="maroon"/><stop offset="1" stop-color="#bf0000"/></radialGradient><path d="M24 40c-2 4-2 7-2 7 4 2 10 5 12 3 0-5.53-4.48-10-10-10" style="fill:url(#b)"/><path d="M21 2 10 8l11 35 8-8 9-29z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="c" x1="60.24" x2="76.04" y1="-28.46" y2="-10.2" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff6159"/><stop offset="1" stop-color="#e40000"/></linearGradient><path d="m10 8 11 35 7-30z" style="fill:url(#c)"/><linearGradient id="d" x1="50.37" x2="56.59" y1="-23.39" y2="-20.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="maroon"/><stop offset="1" stop-color="#a00404"/></linearGradient><path d="m28 13-7 30 8-8 9-29z" style="fill:url(#d)"/><linearGradient id="e" x1="12" x2="36" y1="-20" y2="-20" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffc6c0"/><stop offset="1" stop-color="#ff7575"/></linearGradient><path d="M21 2 10 8l18 5 10-7z" style="fill:url(#e)"/></svg>
\ No newline at end of file
diff --git a/static/images/Alert_Stop_32.png b/static/images/Alert_Stop_32.png
deleted file mode 100644
index ca9566782..000000000
Binary files a/static/images/Alert_Stop_32.png and /dev/null differ
diff --git a/static/images/Alert_Warning.svg b/static/images/Alert_Warning.svg
new file mode 100644
index 000000000..5630803ec
--- /dev/null
+++ b/static/images/Alert_Warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M30 62h6l2-2 4 2h14l8-10-10-4H44l-1 1-3-1h-2z" style="fill:#010101;fill-opacity:.4549"/><path d="M14 41v11l16 8 8-8V41l-16-6z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="56.22" x2="49.67" y1="56.15" y2="65.65" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e07900"/><stop offset="1" stop-color="#fff289"/></linearGradient><path d="m14 41 16 7 8-7-16-6z" style="fill:url(#a)"/><path d="M14 6v28l16 7 8-6V6L22 2z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="b" x1="24.32" x2="51.3" y1="-24.13" y2="-13.84" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff49e"/><stop offset="1" stop-color="#ffbd30"/></linearGradient><path d="M14 6v28l16 7V11zm0 35v11l16 8V48z" style="fill:url(#b)"/><linearGradient id="c" x1="30.5" x2="56.01" y1="-22.81" y2="-9.13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fff289"/></linearGradient><path d="m14 6 16 5 8-5-16-4z" style="fill:url(#c)"/><linearGradient id="d" x1="33.3" x2="46.77" y1="-.68" y2=".74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ed9406"/><stop offset="1" stop-color="#fcb23d"/></linearGradient><path d="M30 11v30l8-6V6zm0 37v12l8-8V41z" style="fill:url(#d)"/></svg>
\ No newline at end of file
diff --git a/static/images/Alert_Warning_32.png b/static/images/Alert_Warning_32.png
deleted file mode 100644
index f13611cde..000000000
Binary files a/static/images/Alert_Warning_32.png and /dev/null differ
diff --git a/static/images/App_Chat.svg b/static/images/App_Chat.svg
new file mode 100644
index 000000000..b3b58cc28
--- /dev/null
+++ b/static/images/App_Chat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M31 32c-7-4-17-6-24-1-3 2-5 6-5 9 0 5 2 9 5 13-1 2-3 2-5 1 3 2 6 3 8 2 2 2 5 3 7 4 3 1 7 2 11 2 6 0 11-2 13-7 4-9-3-19-10-23z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(.17 -.072)scale(.9999)"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.4391 .2625 -.1589 .2658 13.647 37.066)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".706" stop-color="#ffe405"/><stop offset="1" stop-color="#ffa405"/></radialGradient><path d="M31 32c-7-4-17-6-24-1-3 2-5 6-5 9 0 5 2 9 5 13-1 2-3 2-5 1 3 2 6 3 8 2 2 2 5 3 7 4 3 1 7 2 11 2 6 0 11-2 13-7 4-9-3-19-10-23" style="fill:url(#a)"/><radialGradient id="b" cx="0" cy="0" r="64" gradientTransform="matrix(.4391 .2625 -.1589 .2658 13.647 37.066)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe405"/><stop offset="1" stop-color="#ffa405"/></radialGradient><path d="M31 32c-2-1-4-3-6.95-2.93C19 29 24 36 29 41s11 10 13 8c0-7-6-14-11-17" style="fill:url(#b)"/><path d="M15 46c-2 0-5-1-5-1s3 5 5 6m4-4c3 0 4 4 1 4 3 2 2 6-2 3" style="fill:none;stroke:#000;stroke-width:2;stroke-linecap:square"/><path d="M54 37c4.2-2.13 8-5 8-11 0-7.67-5-15.69-12-19.69-8-5-20-6-27-1C17.78 9.03 17 16 19 21c3 9 14 15 23 17 3 1 6.54.85 9 0 2 5 5 9 9.25 10.2C58 47 55.2 41.87 54 37z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="c" cx="0" cy="0" r="64" gradientTransform="matrix(.4075 .2896 -.2096 .2949 34.23 11.689)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".706" stop-color="#7fe583"/><stop offset="1" stop-color="#04b10c"/></radialGradient><path d="M54 37c4.2-2.13 8-5 8-11 0-7.67-5-15.69-12-19.69-8-5-20-6-27-1C17.78 9.03 17 16 19 21c3 9 14 15 23 17 3 1 6.54.85 9 0 2 5 5 9 9.25 10.2C58 47 55.2 41.87 54 37" style="fill:url(#c)"/><path d="m30 23 4 2m-9-7.38v1m.37 4.25.19 1.38M37 21s2 4 2 7-2 4-2 4" style="fill:none;stroke:#000;stroke-width:2;stroke-linecap:square"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Chat_32.png b/static/images/App_Chat_32.png
deleted file mode 100644
index 7558ad651..000000000
Binary files a/static/images/App_Chat_32.png and /dev/null differ
diff --git a/static/images/App_CodyCam.svg b/static/images/App_CodyCam.svg
new file mode 100644
index 000000000..5c6245ee4
--- /dev/null
+++ b/static/images/App_CodyCam.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M38 40c-12.16 0-22 5.37-22 12 0 0 9.84 12 22 12 12.14 0 22-5.39 22-12 0-6.63-9.86-12-22-12" style="fill:#010101;fill-opacity:.4078"/><linearGradient id="a" x1="52" x2="68" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010000"/><stop offset="1" stop-color="#010000" stop-opacity="0"/></linearGradient><path d="M44 44s5.51-6 10-6c4 0 2 8 10 4" style="fill:none;stroke:url(#a);stroke-width:4"/><path d="M28 34s-5 14-14 15v3l20 10 14-14-3-14z" style="fill:none;stroke:#010000;stroke-width:4"/><linearGradient id="b" x1="41.67" x2="71.92" y1="-9.73" y2="-3.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5c5c5c"/><stop offset="1" stop-color="#b8b8b8"/></linearGradient><path d="M34 36v26l14-14-3-14z" style="fill:url(#b)"/><linearGradient id="c" x1="14.26" x2="-8.94" y1="97.46" y2="81.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c9c9c9"/><stop offset="1" stop-color="#fff"/></linearGradient><path d="m14 52 20 10v-4l-20-9z" style="fill:url(#c)"/><linearGradient id="d" x1="51.94" x2="26.51" y1="63.65" y2="73.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#797979"/><stop offset="1" stop-color="#e4e4e4"/></linearGradient><path d="M34 58c7-7 6-19 6-19l-12-5s-5 14-14 15z" style="fill:url(#d)"/><path d="M30 2c-11.05 0-20 8.95-20 20 0 11.03 8.95 20 20 20 11.03 0 20-8.97 20-20 0-11.05-8.97-20-20-20z" style="fill:none;stroke:#010000;stroke-width:4"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.373 .2924 -.3363 .4291 25.29 16.142)" gradientUnits="userSpaceOnUse"><stop offset=".165" stop-color="#fff"/><stop offset=".769" stop-color="#959191"/><stop offset="1" stop-color="#b9b9b9"/></radialGradient><path d="M30 2c-11.05 0-20 8.95-20 20 0 11.03 8.95 20 20 20 11.03 0 20-8.97 20-20 0-11.05-8.97-20-20-20" style="fill:url(#e)"/><linearGradient id="f" x1="-6" x2="38" y1="-4" y2="-4" gradientUnits="userSpaceOnUse"><stop offset=".251" stop-color="#010101"/><stop offset="1" stop-color="#c1acac"/></linearGradient><path d="M12.25 43.25c-2.42 2.35-1.64 7.06 1.74 10.51 3.36 3.47 8.04 4.34 10.47 1.99 2.41-2.34 1.63-7.05-1.73-10.51-3.37-3.45-8.06-4.33-10.48-1.99z" style="fill:none;stroke:url(#f);stroke-width:4" transform="matrix(.9846 .4347 -.4379 .9773 24.683 -30.294)"/><radialGradient id="g" cx="0" cy="0" r="64" gradientTransform="matrix(.1345 .0871 -.0673 .1039 20.705 50.736)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#434a68"/><stop offset="1" stop-color="#0f1238"/></radialGradient><path d="M12.25 43.25c-2.42 2.35-1.64 7.06 1.74 10.51 3.36 3.47 8.04 4.34 10.47 1.99 2.41-2.34 1.63-7.05-1.73-10.51-3.37-3.45-8.06-4.33-10.48-1.99" style="fill:url(#g)" transform="matrix(.9846 .4347 -.4379 .9773 26.838 -30.294)"/><path d="M12.25 43.25c-2.42 2.35-1.64 7.06 1.74 10.51 3.36 3.47 8.04 4.34 10.47 1.99 2.41-2.34 1.63-7.05-1.73-10.51-3.37-3.45-8.06-4.33-10.48-1.99" style="fill:#fff" transform="matrix(-.0781 .1744 -.1757 -.0775 31.659 20.954)"/><path d="M19 53s3.24.24 4.24-.76S24 49 24 49s.87 3.1-.13 4.1S19 53 19 53" style="fill:#fff" transform="matrix(.9846 .4347 -.4379 .9773 26.838 -30.294)"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Debugger.svg b/static/images/App_Debugger.svg
new file mode 100644
index 000000000..d8c36024c
--- /dev/null
+++ b/static/images/App_Debugger.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" color-interpolation="linearRGB"><defs><linearGradient xlink:href="#a" id="i" x1="12.822" x2="35.812" y1="41.906" y2="41.906" gradientUnits="userSpaceOnUse"/></defs><path d="M48 40h-4L26 64h22c8.83 0 16-5.38 16-12 0-6.63-7.17-12-16-12" style="fill:#000100;fill-opacity:.3529"/><path d="M26 8c-8.84 0-16 4.47-16 10v32c0 6.62 7.16 12 16 12 8.83 0 16-5.38 16-12V18c0-5.53-7.17-10-16-10" style="fill:none;stroke:#000100;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"/><linearGradient id="b" x1="42" x2="10" y1="32" y2="32" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9e06"/><stop offset=".251" stop-color="#f7f378"/><stop offset=".845" stop-color="#ffea97"/><stop offset="1" stop-color="#ffb94b"/></linearGradient><path d="M26 28c-8.84 0-16-4.48-16-10v28c0 6.62 7.16 12 16 12 8.83 0 16-5.38 16-12V18c0 5.52-7.17 10-16 10" style="fill:url(#b)"/><linearGradient id="c" x1="42" x2="10" y1="32" y2="32" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#38bc38"/><stop offset=".17" stop-color="#279127"/><stop offset=".826" stop-color="#53ed53"/><stop offset="1" stop-color="#2eaa2e"/></linearGradient><path d="M26 58c-8.84 0-16-5.38-16-12v4c0 6.62 7.16 12 16 12 8.83 0 16-5.38 16-12v-4c0 6.62-7.17 12-16 12" style="fill:url(#c)"/><linearGradient id="d" x1="48.49" x2="69.41" y1="-28.37" y2=".92" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6eff6e"/><stop offset="1" stop-color="#41ca41"/></linearGradient><path d="M10 18c0-5.53 7.16-10 16-10 8.83 0 16 4.47 16 10 0 5.52-7.17 10-16 10-8.84 0-16-4.48-16-10" style="fill:url(#d)"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.2858 .0444 -.0282 .182 23.927 16.026)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eaeaea"/><stop offset=".578" stop-color="#bdbdbd"/><stop offset="1" stop-color="#535353"/></radialGradient><path d="M40 18c0 4.41-6.27 8-14 8-7.74 0-14-3.59-14-8 0-6 6.26-10 14-10 7.73 0 14 4 14 10" style="fill:url(#e)"/><path d="M18 6c0-2.21 3.58-4 8-4 4.41 0 8 1.79 8 4v6c0 2.2-3.59 4-8 4-4.42 0-8-1.8-8-4z" style="fill:none;stroke:#000100;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"/><linearGradient id="f" x1="18" x2="34" y1="4" y2="4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5c5c5"/><stop offset=".25" stop-color="#eee"/><stop offset="1" stop-color="#828282"/></linearGradient><path d="M18 6c0-2.21 3.58-4 8-4 4.41 0 8 1.79 8 4v6c0 2.2-3.59 4-8 4-4.42 0-8-1.8-8-4z" style="fill:url(#f)"/><linearGradient id="g" x1="71.36" x2="90.86" y1="-20.93" y2="8.06" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="M10 18c0-5.53 7.16-10 16-10 8.83 0 16 4.47 16 10 0 5.52-7.17 10-16 10-8.84 0-16-4.48-16-10" style="fill:url(#g)" transform="matrix(.5 0 0 .4 13 -1.2)"/><linearGradient id="h" x1="42.73" x2="56.41" y1="-9.97" y2="20.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f3f3f3"/><stop offset="1" stop-color="#d7d7d7"/></linearGradient><path d="M10 18c0-5.53 7.16-10 16-10 8.83 0 16 4.47 16 10 0 5.52-7.17 10-16 10-8.84 0-16-4.48-16-10" style="fill:url(#h)" transform="matrix(.4197 0 0 .2832 15.022 .728)"/><path d="M10 18c0-5.53 7.16-10 16-10 8.83 0 16 4.47 16 10 0 5.52-7.17 10-16 10-8.84 0-16-4.48-16-10" style="fill:#000100" transform="matrix(.125 0 0 .2 17.75 8.4)"/><linearGradient id="a" x1="10" x2="42" y1="32" y2="32" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff0606"/><stop offset=".242" stop-color="#ff4706"/><stop offset="1" stop-color="#d60505"/></linearGradient><path d="M25.55 32.12c-6.91-1.09-11.17.26-12.11 6.18-.86 5.46 3.09 12.32 9 13.57 5.9 1.25 11.87-4.68 12.73-10.13.94-5.93-2.7-8.53-9.62-9.62z" style="fill:url(#a);stroke:url(#i);stroke-opacity:1;stroke-width:4;stroke-dasharray:none"/><linearGradient id="j" x1="10" x2="42" y1="32" y2="32" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e1e1e1"/><stop offset=".25" stop-color="#fff"/><stop offset="1" stop-color="#cdcdcd"/></linearGradient><path d="M25.55 32.12c-6.91-1.09-11.17.26-12.11 6.18-.86 5.46 3.09 12.32 9 13.57 5.9 1.25 11.87-4.68 12.73-10.13.94-5.93-2.7-8.53-9.62-9.62" style="fill:url(#j)"/><path d="m49 25 10-13m-10 0 10 13m-12-7h14" style="fill:none;stroke:#000100;stroke-width:3;stroke-linecap:round" transform="translate(-30 23)"/><path d="M10 18c0-5.53 7.16-10 16-10 8.83 0 16 4.47 16 10 0 5.52-7.17 10-16 10-8.84 0-16-4.48-16-10" style="fill:#000100" transform="matrix(.2499 0 0 .6999 17.5 29.4)"/><linearGradient id="k" x1="10" x2="42" y1="32" y2="32" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff0606"/><stop offset=".242" stop-color="#ff4706"/><stop offset="1" stop-color="#d60505"/></linearGradient><path d="M15 47s4.15-1.46 8.8-3.84C30 40 33 36 33 36" style="fill:none;stroke:url(#k);stroke-width:3;stroke-linecap:round"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Finance.svg b/static/images/App_Finance.svg
new file mode 100644
index 000000000..0cca42d96
--- /dev/null
+++ b/static/images/App_Finance.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M38 64s4 0 6-2c2 0 7 0 11-1 0 0 2 1 3 0s1-3 1-3c1-1 5-6 4.96-10.94C64 44 62 41 60 40c2-2 0-8-6-8L8 38v16s0 2 6 2c0 0 2 4 10 4h14z" style="fill:#010101;fill-opacity:.4627"/><path d="M30 2c15.68 0 28 12.31 28 28 0 15.68-12.32 28-28 28C14.31 58 2 45.68 2 30 2 14.31 14.31 2 30 2z" style="fill:none;stroke:#010101;stroke-width:4"/><path d="M38 62c-4 0-4-6-4-6 0-1 2-2 4-2s4 1 4 2c0 0 0 6-4 6z" style="fill:none;stroke:#010101;stroke-width:4" transform="matrix(.5359 .8442 -.7035 .4466 29.6 -7.45)"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.125 0 0 .1093 35 56)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffacac"/><stop offset="1" stop-color="#d04e4e"/></radialGradient><path d="M38 62c-4 0-4-6-4-6 0-1 2-2 4-2s4 1 4 2c0 0 0 6-4 6" style="fill:url(#a)" transform="rotate(57.593 31.28 28.534)"/><path d="M38 62c-4 0-4-6-4-6 0-1 2-2 4-2s4 1 4 2c0 0 0 6-4 6z" style="fill:none;stroke:#010101;stroke-width:4" transform="rotate(-45.001 39.56 25.354)scale(1 .8332)"/><path d="M38 62c-4 0-4-6-4-6 0-1 2-2 4-2s4 1 4 2c0 0 0 6-4 6" style="fill:#a72323" transform="rotate(-45.001 26.686 30.686)"/><radialGradient id="b" cx="0" cy="0" r="64" gradientTransform="translate(18 18)scale(.625)" gradientUnits="userSpaceOnUse"><stop offset=".003" stop-color="#fff"/><stop offset=".495" stop-color="#ffacac"/><stop offset="1" stop-color="#d04e4e"/></radialGradient><path d="M30 2c15.68 0 28 12.31 28 28 0 15.68-12.32 28-28 28C14.31 58 2 45.68 2 30 2 14.31 14.31 2 30 2" style="fill:url(#b)"/><path d="M6 15c3 0 10 1 12-1s1-5-2-8m16 14c0 2 4 3 7 5s7 8 9 8c3 0 3-10 3-13zM22 58h6c3 0 7-3-2-17h-4" style="fill:#cd0505;fill-opacity:.4627"/><path d="M38 62c-4 0-4-6-4-6 0-1 2-2 4-2s4 1 4 2c0 0 0 6-4 6z" style="fill:none;stroke:#010101;stroke-width:4" transform="matrix(.9081 -.4186 .3489 .7568 -16.328 30.924)"/><radialGradient id="c" cx="0" cy="0" r="64" gradientTransform="matrix(.125 0 0 .1093 35 56)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffacac"/><stop offset="1" stop-color="#d04e4e"/></radialGradient><path d="M38 62c-4 0-4-6-4-6 0-1 2-2 4-2s4 1 4 2c0 0 0 6-4 6" style="fill:url(#c)" transform="rotate(-24.748 38.01 58.012)"/><path d="M24.03 14.07C26 11 30 7 33 5l1.96.92C32 8 28 12 26 15z" style="fill:none;stroke:#d96969;stroke-width:4"/><path d="M24.03 14.07C26 11 30 7 33 5l1.96.92C32 8 28 12 26 15z" style="fill:#010101" transform="translate(0 1)"/><path d="M28 43c0-4-6-8-14-8S0 39 0 43c0 2 2 6 2 6 2 3 7 5 12 5s10-2 12-5c0 0 2-4 2-6z" style="fill:none;stroke:#010101;stroke-width:4" transform="rotate(45.001 6.869 43.718)scale(1 .8695)"/><radialGradient id="d" cx="0" cy="0" r="64" gradientTransform="matrix(.3551 .1202 -.0847 .2502 3.745 40.536)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffdfdf"/><stop offset=".495" stop-color="#ffacac"/><stop offset="1" stop-color="#d04e4e"/></radialGradient><path d="M28 43c0-4-6-8-14-8S0 39 0 43c0 2 2 6 2 6 2 3 7 5 12 5s10-2 12-5c0 0 2-4 2-6" style="fill:url(#d)" transform="rotate(45.001 16 47.5)"/><linearGradient id="e" x1="25.73" x2="38.86" y1="26.44" y2="46.53" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffacac"/><stop offset="1" stop-color="#d96969"/></linearGradient><path d="M14 40c6.71 0 12 3.08 12 7 0 3.91-5.29 7-12 7-6.73 0-12-3.09-12-7 0-3.92 5.27-7 12-7" style="fill:url(#e)" transform="rotate(45.001 16 47.5)"/><path d="M14 40c2.21 0 4.23.4 6 1-11-1-17 4-17 7s2 4 2 4c-2.04-1.25-3-3.11-3-5 0-3.92 5.27-7 12-7" style="fill:#fff" transform="rotate(45.001 16 47.5)"/><path d="M28 32c-4 0-4 6 0 6s4-6 0-6" style="fill:#010101" transform="translate(-12.838 -1.667)scale(.8333)"/><path d="M28 32c-4 0-4 6 0 6s4-6 0-6" style="fill:#010101"/><path d="M15 13c1-1 1-6-1-6l-4-1C6 6 4 6 4 8s1 6 2 7m40 12c1 0 3-2 3-6 0-3-3-5-5-5-5.1 0-11 1-10 4" style="fill:none;stroke:#010101;stroke-width:4"/><path d="M16 14c0-1 0-7-2-7l-4-1C6 6 4 6 4 8c0-2 12 5 12 6m16 6c0-1 17 0 17 1 0-3-3-5-5-5-5.1 0-12 1-12 4" style="fill:#ffacac"/><path d="M6 15c1 0 2-1 4-1h6c0-1-12-8-12-6s1 6 2 7m26 5c0 2 5 2 8 4s4 5 6 5c1 0 3-4 3-8 0-1-17-2-17-1" style="fill:#d96969"/><path d="M16 14c0-1-12-8-12-6 1-4 11 4 12 6m16 6c2-1 17-2 17 1 0-1-17-2-17-1" style="fill:#fff"/><linearGradient id="f" x1="23.07" x2="27.13" y1="40.59" y2="45" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a72323"/><stop offset=".45" stop-color="#ffacac"/><stop offset="1" stop-color="#fff"/></linearGradient><path d="M18 46c-3-1-3 5 0 6s3-5 0-6z" style="fill:none;stroke:url(#f);stroke-width:1" transform="matrix(.8117 0 0 .8629 -4.112 2.216)"/><linearGradient id="g" x1="23.07" x2="27.13" y1="40.59" y2="45" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a72323"/><stop offset=".45" stop-color="#ffacac"/><stop offset="1" stop-color="#fff"/></linearGradient><path d="M18 46c-3-1-3 5 0 6s3-5 0-6z" style="fill:none;stroke:url(#g);stroke-width:1"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Finance_32.png b/static/images/App_Finance_32.png
deleted file mode 100644
index e67b9b057..000000000
Binary files a/static/images/App_Finance_32.png and /dev/null differ
diff --git a/static/images/App_Generic.svg b/static/images/App_Generic.svg
new file mode 100644
index 000000000..1996224a9
--- /dev/null
+++ b/static/images/App_Generic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M19 60h6l8-8 14 8h6l11-11-7-4-27 4z" style="fill:#010101;fill-opacity:.4549"/><path d="M18 14v16l16 8 10-10V12L29 6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(-16 20)"/><linearGradient id="a" x1="26.68" x2="34.48" y1="46.52" y2="36.39" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c6d7f5"/><stop offset="1" stop-color="#6b94dd"/></linearGradient><path d="M18 14v16l16 8V21z" style="fill:url(#a)" transform="translate(-16 20)"/><path d="M34 21v17l10-10V12z" style="fill:#003cb0" transform="translate(-16 20)"/><path d="m24 34 4 11v-9z" style="fill:#0d2964" transform="translate(0 1)"/><linearGradient id="b" x1="26.68" x2="34.48" y1="46.52" y2="36.39" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c6d7f5"/><stop offset="1" stop-color="#6b94dd"/></linearGradient><path d="m2 34 16 7 10-9-15-6z" style="fill:url(#b)"/><path d="M18 14v16l16 8 10-10V12L29 6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(12 20)"/><path d="m34 43-.01 8.99L46 58V41l-4.93-2.16z" style="fill:#ec6666"/><path d="M30 34v16l3.99 1.99L34 43l7.07-4.16z" style="fill:#cd4d4d"/><linearGradient id="c" x1="70.4" x2="71.08" y1="34.52" y2="50.83" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a3043c"/><stop offset="1" stop-color="#ffdce6"/></linearGradient><path d="M34 21v17l10-10V12z" style="fill:url(#c)" transform="translate(12 20)"/><path d="M41.07 38.84 46 41l10-9-5.01-2.01z" style="fill:#ffacac"/><linearGradient id="d" x1="138.84" x2="86.24" y1="49.93" y2="116.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c13e3e"/><stop offset="1" stop-color="#e27a7a"/></linearGradient><path d="m30 34 11.07 4.84 9.92-8.85L41 26z" style="fill:url(#d)"/><path d="M18 14v16l16 8 10-10V12L29 6z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="e" x1="-19.87" x2="5.48" y1="-1.53" y2="-26.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffec4b"/><stop offset="1" stop-color="#f0a506"/></linearGradient><path d="M18 14v16l16 8V21z" style="fill:url(#e)"/><linearGradient id="f" x1="30.5" x2="56.01" y1="-22.81" y2="-9.13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fff289"/></linearGradient><path d="m18 14 16 7 10-9-15-6z" style="fill:url(#f)"/><linearGradient id="g" x1="53.01" x2="69.94" y1="-9.55" y2="3.43" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f99b05"/><stop offset="1" stop-color="#fcb23d"/></linearGradient><path d="M34 21v17l10-10V12z" style="fill:url(#g)"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Generic_32.png b/static/images/App_Generic_32.png
deleted file mode 100644
index 41bd9a542..000000000
Binary files a/static/images/App_Generic_32.png and /dev/null differ
diff --git a/static/images/App_HaikuDepot.svg b/static/images/App_HaikuDepot.svg
new file mode 100644
index 000000000..6a0b30760
--- /dev/null
+++ b/static/images/App_HaikuDepot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M32 62h8l4 2 17-21-5.2-2.6L60 38l-8-1z" style="fill:#000;fill-opacity:.396"/><path d="M10 39v10l22 11 18-18v-6" style="fill:none;stroke:#000;stroke-width:4;stroke-linejoin:round"/><linearGradient id="a" x1="46.07" x2="23.93" y1="78.24" y2="73.15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a3784b"/><stop offset="1" stop-color="#76401c"/></linearGradient><path d="m32 38 18-18v22L32 60z" style="fill:url(#a)"/><path d="M32 38h10L32 48z" style="fill:#5d2b0c"/><linearGradient id="b" x1="44.47" x2="29.89" y1="70.75" y2="79.36" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#be8852"/><stop offset="1" stop-color="#dca977"/></linearGradient><path d="M11.89 36.01 14 46l18 9v5L10 49V35.99z" style="fill:url(#b)"/><linearGradient id="c" x1="54.08" x2="50.66" y1="49.54" y2="59.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7c4e28"/><stop offset="1" stop-color="#a17545"/></linearGradient><path d="M32 38v17l-18-9-2.11-9.99z" style="fill:url(#c)"/><path d="M24 46 2 35l8-8H2l22-13h6l7-8 17 6-4 11 12 3-18 18-12-6z" style="fill:none;stroke:#000;stroke-width:4;stroke-linejoin:round"/><linearGradient id="d" x1="44.25" x2="55.01" y1="2.48" y2="17.28" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#663200"/><stop offset="1" stop-color="#834f1c"/></linearGradient><path d="m10 27 20-13v19l-6.11 4.88L10 30.99z" style="fill:url(#d)"/><linearGradient id="e" x1="42.68" x2="61.51" y1="-29.81" y2="-25.25" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e5b07b"/><stop offset="1" stop-color="#ffce9e"/></linearGradient><path d="m30 14 4 16 16 7V22z" style="fill:url(#e)"/><path d="m30 14 4 16 16 7-8.15 1.33L30 33z" style="fill:#945f2c"/><path d="m30 33-6.11 4.88L32 38l4.1-2.26z" style="fill:#85501c"/><linearGradient id="f" x1="32.24" x2="49.83" y1="-14.37" y2="-16.21" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fccc9d"/><stop offset="1" stop-color="#eeb781"/></linearGradient><path d="m37 6 17 6-4 11-20-9z" style="fill:url(#f)"/><path d="m2 27 22-13h6L10 27z" style="fill:#ffdcba"/><path d="M18 14v16l16 8 10-10V12L29 6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(5.172 20.125)scale(.5517)"/><linearGradient id="g" x1="26.68" x2="34.48" y1="46.52" y2="36.39" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c6d7f5"/><stop offset="1" stop-color="#6b94dd"/></linearGradient><path d="M18 14v16l16 8V21z" style="fill:url(#g)" transform="translate(5.172 20.125)scale(.5517)"/><path d="M34 21v17l10-10V12z" style="fill:#003cb0" transform="translate(5.172 20.125)scale(.5517)"/><path d="m24 34 4 11v-9z" style="fill:#0d2964" transform="translate(14 9.643)scale(.5517)"/><linearGradient id="h" x1="26.68" x2="34.48" y1="46.52" y2="36.39" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c6d7f5"/><stop offset="1" stop-color="#6b94dd"/></linearGradient><path d="m2 34 16 7 10-9-15-6z" style="fill:url(#h)" transform="translate(14 9.09)scale(.5517)"/><path d="M18 14v16l16 8 10-10V12L29 6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(20.62 20.125)scale(.5517)"/><path d="m34 43-.01 8.99L46 58V41l-4.93-2.16z" style="fill:#ec6666" transform="translate(14 9.09)scale(.5517)"/><path d="M30 34v16l3.99 1.99L34 43l7.07-4.16z" style="fill:#cd4d4d" transform="translate(14 9.09)scale(.5517)"/><linearGradient id="i" x1="70.4" x2="71.08" y1="34.52" y2="50.83" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a3043c"/><stop offset="1" stop-color="#ffdce6"/></linearGradient><path d="M34 21v17l10-10V12z" style="fill:url(#i)" transform="translate(20.62 20.125)scale(.5517)"/><path d="M41.07 38.84 46 41l10-9-5.01-2.01z" style="fill:#ffacac" transform="translate(14 9.09)scale(.5517)"/><linearGradient id="j" x1="138.84" x2="86.24" y1="49.93" y2="116.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c13e3e"/><stop offset="1" stop-color="#e27a7a"/></linearGradient><path d="m30 34 11.07 4.84 9.92-8.85L41 26z" style="fill:url(#j)" transform="translate(14 9.09)scale(.5517)"/><path d="M18 14v16l16 8 10-10V12L29 6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(14 9.09)scale(.5517)"/><linearGradient id="k" x1="-19.87" x2="5.48" y1="-1.53" y2="-26.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffec4b"/><stop offset="1" stop-color="#f0a506"/></linearGradient><path d="M18 14v16l16 8V21z" style="fill:url(#k)" transform="translate(14 9.09)scale(.5517)"/><linearGradient id="l" x1="30.5" x2="56.01" y1="-22.81" y2="-9.13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fff289"/></linearGradient><path d="m18 14 16 7 10-9-15-6z" style="fill:url(#l)" transform="translate(14 9.09)scale(.5517)"/><linearGradient id="m" x1="53.01" x2="69.94" y1="-9.55" y2="3.43" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f99b05"/><stop offset="1" stop-color="#fcb23d"/></linearGradient><path d="M34 21v17l10-10V12z" style="fill:url(#m)" transform="translate(14 9.09)scale(.5517)"/><linearGradient id="n" x1="43.44" x2="62.48" y1="10.75" y2="20.22" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd5ac"/><stop offset="1" stop-color="#b07842"/></linearGradient><path d="m32 38 18-15 12 3-18 18z" style="fill:url(#n)"/><linearGradient id="o" x1="1.22" x2="44.89" y1="-19.6" y2="-14.22" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe3c7"/><stop offset="1" stop-color="#f3b476"/></linearGradient><path d="m2 35 22 11 8-8-22-11z" style="fill:url(#o)"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Installer.svg b/static/images/App_Installer.svg
new file mode 100644
index 000000000..41b56aa39
--- /dev/null
+++ b/static/images/App_Installer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M18 62h6l2-2s8 4 18 4L28 52z" style="fill:#010101;fill-opacity:.4941"/><path d="M6 22v32l12 6 20-20V12l2-4h-8l-2 2-4-4V2L4 8l-2 6z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="54.19" x2="63.71" y1="-9.12" y2="11.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9a9a9a"/><stop offset="1" stop-color="#384150"/></linearGradient><path d="m6 22 24-12v24z" style="fill:url(#a)"/><path d="m30 10 4 8 4-6z" style="fill:#a2a2a2"/><path d="M30 10v10l4-4z" style="fill:#606c7e"/><linearGradient id="b" x1="37.54" x2="62.67" y1="-6.89" y2="38.63" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c7ecff"/><stop offset="1" stop-color="#5fbbeb"/></linearGradient><path d="M6 22v32l12 6V30L8 26z" style="fill:url(#b)"/><path d="m6 22 2 4 10 4v-4z" style="fill:#339cd3"/><linearGradient id="c" x1="72.21" x2="77.87" y1="13.59" y2="36.96" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1f8cc4"/><stop offset="1" stop-color="#214c8b"/></linearGradient><path d="m18 60 20-20V12L18 26z" style="fill:url(#c)"/><linearGradient id="d" x1="60.15" x2="61.67" y1="1.45" y2="14.63" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b9b9b9"/><stop offset="1" stop-color="#e9e9e9"/></linearGradient><path d="m10 20-6-2-2-4 24-8 4 4z" style="fill:url(#d)"/><linearGradient id="e" x1="-2" x2="30" y1="-16" y2="-16" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#838383"/><stop offset="1" stop-color="#999"/></linearGradient><path d="m2 14 24-8V2L4 8z" style="fill:url(#e)"/><path d="m6 22 12 4-2-4-12-4z" style="fill:#1881b7"/><path d="m38 12 2-4h-8l-2 2z" style="fill:#cacaca"/><path d="M54.06 31.18c-7.01-8.05-19.57-11.21-27.09-4.66s-5.99 19.31 1.02 27.36c7.02 8.06 19.58 11.21 27.1 4.66s5.99-19.31-1.03-27.36zm-9.52 8.39c-1.87-2.15-4.06-2.13-5.31-1.04-1.26 1.09-1.58 3.63.29 5.78 1.88 2.15 4.06 2.13 5.32 1.04 1.25-1.09 1.57-3.63-.3-5.78z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="f" x1="5.59" x2="43.32" y1="46.67" y2="5.73" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f1f1f1"/><stop offset=".212" stop-color="#d9ddf4"/><stop offset=".542" stop-color="#837ead"/><stop offset=".708" stop-color="#b8bedb"/><stop offset="1" stop-color="#f4f4f4"/></linearGradient><path d="M54.06 31.18c-7.01-8.05-19.57-11.21-27.09-4.66s-5.99 19.31 1.02 27.36c7.02 8.06 19.58 11.21 27.1 4.66s5.99-19.31-1.03-27.36M47.64 48.2c-2.5 2.18-6.88 2.21-10.62-2.08-3.74-4.3-3.11-8.63-.6-10.81s6.57-1.95 10.31 2.35 3.42 8.35.91 10.54" style="fill:url(#f)"/><path d="M47.64 48.2c-2.5 2.18-6.88 2.21-10.62-2.08-3.74-4.3-3.11-8.63-.6-10.81s6.57-1.95 10.31 2.35 3.42 8.35.91 10.54m-3.1-8.63c-1.87-2.15-4.06-2.13-5.31-1.04-1.26 1.09-1.58 3.63.29 5.78 1.88 2.15 4.06 2.13 5.32 1.04 1.25-1.09 1.57-3.63-.3-5.78" style="fill:#ebebeb;fill-opacity:.8156"/><linearGradient id="g" x1="51.27" x2="64.1" y1="8.97" y2="36.67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4137a9"/><stop offset="1" stop-color="#b9b9b9"/></linearGradient><path d="M47.64 48.2c-2.5 2.18-6.88 2.21-10.62-2.08-3.74-4.3-3.11-8.63-.6-10.81s6.57-1.95 10.31 2.35 3.42 8.35.91 10.54z" style="fill:none;stroke:url(#g);stroke-width:2"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Mail.svg b/static/images/App_Mail.svg
new file mode 100644
index 000000000..16661ec5f
--- /dev/null
+++ b/static/images/App_Mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M25 64h3l10-10h6c2 0 5-1 7-3 .53-.54 5.37-5 5.37-5H59l4-6-1.5-1c2-3 2.5-4 2.5-7s-2-4-4-5z" style="fill:#000;fill-opacity:.4156"/><path d="M58 32V20c0-9-3-14-12-17-5-2-9-1-15 2l-17 8c-2.24 2.04-4 5.72-3.99 9.98L10 41l2 1-10 7 23 13 10-10 1.98 1.01z" style="fill:none;stroke:#000;stroke-width:4;stroke-linejoin:round"/><linearGradient id="a" x1="88.51" x2="125.88" y1="-66.76" y2="-12.97" gradientUnits="userSpaceOnUse"><stop offset=".289" stop-color="#5f8493"/><stop offset=".523" stop-color="#eaf7ff"/><stop offset=".639" stop-color="#a5b7c2"/><stop offset=".763" stop-color="#a0bccc"/><stop offset=".865" stop-color="#748994"/><stop offset="1" stop-color="#829ab2"/></linearGradient><path d="M58 32V20c0-9-3-14-12-17-5-2-9-1-15 2l-17 8 22 24v17z" style="fill:url(#a)"/><linearGradient id="b" x1="33.05" x2="62.02" y1="-13.06" y2="15.9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#acd3db"/><stop offset=".624" stop-color="#fff"/><stop offset="1" stop-color="#6492a8"/></linearGradient><path d="M38 39c1.07-11.01-1.52-21.76-10-26-4-2-8-2-13 0 5 0 7 0 10 2 7.11 4.73 12 12 13 24" style="fill:url(#b)"/><path d="M36 54V38c0-9-2.37-18.19-12-23-4.23-2.12-8-2-11 0" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="c" x1="-9.25" x2="8.06" y1="2.93" y2="-8.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f7fbfd"/><stop offset="1" stop-color="#31596b"/></linearGradient><path d="M24 15c-9.94-4.98-14 1-13.99 10.98L10 41l1-15c0-10 3-16 13-11h.01z" style="fill:url(#c)"/><linearGradient id="d" x1="66.96" x2="47.68" y1="38.95" y2="61.3" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#343d41"/><stop offset=".188" stop-color="#364145"/><stop offset="1" stop-color="#566f7a"/></linearGradient><path d="M24 15c-9.94-4.98-13 1-12.99 10.98L11 41l23.46-14.05C32.63 21.6 29.15 17.57 24.01 15z" style="fill:url(#d)"/><linearGradient id="e" x1="3.3" x2="29.74" y1="28.06" y2="7.36" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#435563"/><stop offset="1" stop-color="#2d4048"/></linearGradient><path d="M12 42s15-1 24 3v-8c-.02-3.74-.53-7.1-1.54-10.05L10 41z" style="fill:url(#e)"/><linearGradient id="f" x1="-7.32" x2="-4.14" y1="52.74" y2="33.48" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#bed1db"/><stop offset="1" stop-color="#8dadba"/></linearGradient><path d="M36 45v7.5l-1-.5-10 10L2 49l10-7s15-1 24 3" style="fill:url(#f)"/><path d="m15 44-7 5 11 7 15-12z" style="fill:#7795a3"/><path d="M11.86 29.98 3 35l15 17 13.85-10.01S29 39 24 36s-12.14-6.02-12.14-6.02zM36 34 26 22l-14.14 7.98S19 33 24 36s7.85 5.99 7.85 5.99L36 39z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="g" x1="25.01" x2="41.57" y1="14.97" y2="33.52" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffeec0"/><stop offset="1" stop-color="#e7d6a8"/></linearGradient><path d="M11.86 29.98 3 35l15 17 13.85-10.01S29 39 24 36s-12.14-6.02-12.14-6.02" style="fill:url(#g)"/><linearGradient id="h" x1="1.65" x2="13.11" y1="13.86" y2="4.28" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b4a06b"/><stop offset="1" stop-color="#a28b4e"/></linearGradient><path d="M36 34 26 22l-14.14 7.98S19 33 24 36s7.85 5.99 7.85 5.99L36 39z" style="fill:url(#h)"/><path d="M3 35s7.73 2.44 14 3.41L18 51l.65-12.37c2.83.32 5.13.23 5.92-.71.47-.56.79-2.27 1-4.38L36 36l-10.31-3.9C26.04 27.52 26 22 26 22s-1 12-3 14-20-1-20-1" style="fill:#826a31"/><path d="M44 7v24l2 1 1-1V18l7-6V3l-2-1z" style="fill:none;stroke:#000;stroke-width:4"/><path d="M46 17.99V8l8-5v9l-6 5z" style="fill:#f20606"/><linearGradient id="i" x1="76.17" x2="76.55" y1="3.07" y2="31.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffc7ba"/><stop offset="1" stop-color="#c31a1a"/></linearGradient><path d="M44 16.88V7l2 1v9.88z" style="fill:url(#i)"/><path d="m44 7 2 1 8-5-2-1z" style="fill:#faa28e"/><linearGradient id="j" x1="76.17" x2="76.55" y1="3.07" y2="31.1" gradientUnits="userSpaceOnUse"><stop offset=".007" stop-color="#e3e3e3"/><stop offset="1" stop-color="#59697a"/></linearGradient><path d="M46 32V17.99l1 .01v13z" style="fill:url(#j)"/><linearGradient id="k" x1="75.17" x2="75.55" y1="4.07" y2="32.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d6d9dc"/><stop offset="1" stop-color="#788999"/></linearGradient><path d="m46 32-2-1V16.99l2 1.14z" style="fill:url(#k)"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Mail_32.png b/static/images/App_Mail_32.png
deleted file mode 100644
index 35638fbf1..000000000
Binary files a/static/images/App_Mail_32.png and /dev/null differ
diff --git a/static/images/App_People.svg b/static/images/App_People.svg
new file mode 100644
index 000000000..866335b2f
--- /dev/null
+++ b/static/images/App_People.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M34 64h11c5 0 6-1 11-2 7.84-1.57 7-4 4-6-3.44-2.29 2.56-1.87 1-5-1-2-9-4-9-4l-10 9z" style="fill:#010101;fill-opacity:.4235"/><path d="M22 21v17l2 2v17l4 2h2v1l4 2 6-6V42l2-2V23l-13-6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(10 -6)"/><linearGradient id="a" x1="96.6" x2="124.61" y1="-47.07" y2="-15.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ee9bb0"/><stop offset="1" stop-color="#cc5876"/></linearGradient><path d="M22 21v16l2 3v17l4 2h2v1l4 2V45h2V27z" style="fill:url(#a)" transform="translate(10 -6)"/><linearGradient id="b" x1="-37.97" x2="-18.83" y1="-32.98" y2="-50.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe3ea"/><stop offset=".996" stop-color="#f0a8bb"/></linearGradient><path d="m22 21 14 6 6-4-10-1 3.99-2.01L29 17z" style="fill:url(#b)" transform="translate(10 -6)"/><linearGradient id="c" x1="57.23" x2="78.84" y1="-50.61" y2="-43.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a02646"/><stop offset="1" stop-color="#d53961"/></linearGradient><path d="M36 45h-2v17l6-6V42l2-2V23l-6 4z" style="fill:url(#c)" transform="translate(10 -6)"/><path d="M34 45v6l6-9-4 3z" style="fill:#71152d" transform="translate(10 -6)"/><linearGradient id="d" x1="30.92" x2="41.07" y1="-67" y2="-67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ab123a"/><stop offset="1" stop-color="#dd718d"/></linearGradient><path d="m32 22 10 1-6-3z" style="fill:url(#d)" transform="translate(10 -6)"/><path d="M31 10c-2.5 0-5 2.5-5 5s2.5 5 5 5 5-2.5 5-5-2.5-5-5-5z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(12 -6)"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.1707 0 0 .1694 30.553 12.474)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".674" stop-color="#7d7a7a"/><stop offset="1" stop-color="#bca184"/></radialGradient><path d="M31 10c-2.5 0-5 2.5-5 5s2.5 5 5 5 5-2.5 5-5-2.5-5-5-5" style="fill:url(#e)" transform="translate(12 -6)"/><path d="M22 21v17l2 2v17l4 2h2v1l4 2 6-6V42l2-2V23l-13-6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(-16 -6)"/><linearGradient id="f" x1="85.74" x2="128.61" y1="-57.07" y2="-8.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d5dcff"/><stop offset="1" stop-color="#9d9bd5"/></linearGradient><path d="M22 21v16l2 3v17l4 2h2v1l4 2V45h2V27z" style="fill:url(#f)" transform="translate(-16 -6)"/><linearGradient id="g" x1="-37.97" x2="-18.83" y1="-32.98" y2="-50.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".996" stop-color="#a4a3d7"/></linearGradient><path d="m22 21 14 6 6-4-10-1 3.99-2.01L29 17z" style="fill:url(#g)" transform="translate(-16 -6)"/><linearGradient id="h" x1="56.23" x2="77.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#373583"/><stop offset="1" stop-color="#6967c0"/></linearGradient><path d="M36 45h-2v17l6-6V42l2-2V23l-6 4z" style="fill:url(#h)" transform="translate(-16 -6)"/><path d="M34 45v6l6-9-4 3z" style="fill:#252382" transform="translate(-16 -6)"/><linearGradient id="i" x1="30.92" x2="41.07" y1="-66" y2="-66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#33318c"/><stop offset="1" stop-color="#a4a3d7"/></linearGradient><path d="m32 22 10 1-6-3z" style="fill:url(#i)" transform="translate(-16 -6)"/><path d="M31 10c-2.5 0-5 2.5-5 5s2.5 5 5 5 5-2.5 5-5-2.5-5-5-5z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(-16 -6)"/><radialGradient id="j" cx="0" cy="0" r="64" gradientTransform="matrix(.1707 0 0 .1694 30.553 12.474)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".674" stop-color="#7d7a7a"/><stop offset="1" stop-color="#bca184"/></radialGradient><path d="M31 10c-2.5 0-5 2.5-5 5s2.5 5 5 5 5-2.5 5-5-2.5-5-5-5" style="fill:url(#j)" transform="translate(-16 -6)"/><linearGradient id="k" x1="56.23" x2="77.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#373583"/><stop offset="1" stop-color="#6967c0"/></linearGradient><path d="M28 59h2V45l-2-1z" style="fill:url(#k)" transform="translate(-16 -6)"/><path d="M22 21v17l2 2v17l4 2h2v1l4 2 6-6V42l2-2V23l-13-6z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="l" x1="85.74" x2="128.61" y1="-57.07" y2="-8.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffdb97"/><stop offset="1" stop-color="#fcaf29"/></linearGradient><path d="M22 21v16l2 3v17l4 2h2v1l4 2V45h2V27z" style="fill:url(#l)"/><linearGradient id="m" x1="-37.97" x2="-18.83" y1="-32.98" y2="-50.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff7ea"/><stop offset=".996" stop-color="#fdd17b"/></linearGradient><path d="m22 21 14 6 6-4-10-1 3.99-2.01L29 17z" style="fill:url(#m)"/><linearGradient id="n" x1="55.23" x2="76.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85805"/><stop offset="1" stop-color="#f06306"/></linearGradient><path d="M36 45h-2v17l6-6V42l2-2V23l-6 4z" style="fill:url(#n)"/><path d="M34 45v6l6-9-4 3z" style="fill:#a32904"/><linearGradient id="o" x1="29.92" x2="40.07" y1="-66" y2="-66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85804"/><stop offset="1" stop-color="#dc952f"/></linearGradient><path d="m32 22 10 1-6-3z" style="fill:url(#o)"/><path d="M32 8c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="p" cx="0" cy="0" r="64" gradientTransform="matrix(.1707 0 0 .1694 30.553 12.474)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".674" stop-color="#7d7a7a"/><stop offset="1" stop-color="#bca184"/></radialGradient><path d="M32 8c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6" style="fill:url(#p)"/><linearGradient id="q" x1="55.23" x2="76.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85805"/><stop offset="1" stop-color="#f06306"/></linearGradient><path d="M28 59h2V45l-2-1z" style="fill:url(#q)"/></svg>
\ No newline at end of file
diff --git a/static/images/App_People_32.png b/static/images/App_People_32.png
deleted file mode 100644
index e9e7b4bd6..000000000
Binary files a/static/images/App_People_32.png and /dev/null differ
diff --git a/static/images/App_People_64.png b/static/images/App_People_64.png
deleted file mode 100644
index 4efa3d069..000000000
Binary files a/static/images/App_People_64.png and /dev/null differ
diff --git a/static/images/App_StyledEdit.svg b/static/images/App_StyledEdit.svg
new file mode 100644
index 000000000..0f115ceae
--- /dev/null
+++ b/static/images/App_StyledEdit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m27 62 2 2 3.13-3.17L37 64l8.39-11.46L64 43l-5-3 2 2-25 12zm31-23 4-3-4-2-3 3z" style="fill:#010101;fill-opacity:.5725"/><path d="M6.25 35s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 20z" style="fill:none;stroke:#010101;stroke-width:4"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.5714 0 0 .3333 26 40)" gradientUnits="userSpaceOnUse"><stop offset=".489" stop-color="#f1b706"/><stop offset="1" stop-color="#fffcc0"/></radialGradient><path d="M6.25 35s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l23.79-13.67L46 47l3-4 8.05.06 2.07-1.19L32 20z" style="fill:url(#a)"/><path d="M50.04 47.08 46 47l3-4 8.05.06z" style="fill:#e2c255"/><path d="M2.62 35.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:none;stroke:#010101;stroke-width:4"/><linearGradient id="b" x1="107.04" x2="118.33" y1="-12.09" y2="32.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffefa5"/><stop offset=".742" stop-color="#fffcc0"/><stop offset="1" stop-color="#fff890"/></linearGradient><path d="M2.62 35.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88L44.86 47 33 45.25 23 43l2-1 12-1.25 12.74.5 8.38-9.88s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:url(#b)"/><linearGradient id="c" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m20 41 14.87-15.13M14 37l12.87-13" style="fill:none;stroke:url(#c);stroke-width:1"/><linearGradient id="d" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m17 39 11.12-11.38" style="fill:none;stroke:url(#d);stroke-width:1"/><linearGradient id="e" x1="17.77" x2="46.22" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5b03a"/><stop offset="1" stop-color="#e9da71"/></linearGradient><path d="M44.86 47 33 45.25 23 43l2-1 12-1.25 12.74.5z" style="fill:url(#e)"/><path d="M17 4h34s3 1 3 5-3 5-3 5H17L6 9zm.96.58L16 7v4l1.96 2.41m27-8.83C44.1 5.25 43 6.57 43 9c0 2.42 1.1 3.74 1.96 4.41" style="fill:none;stroke:#010101;stroke-width:4" transform="rotate(-45.001 53.218 -.332)"/><linearGradient id="f" x1="43.05" x2="40.39" y1="9.82" y2="21.77" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffeed5"/><stop offset=".553" stop-color="#dbab5f"/><stop offset=".814" stop-color="#ffeed5"/></linearGradient><path d="m17 4-2.63 2.76v4.47L17 14 8.69 9.84l.05-1.72z" style="fill:url(#f)" transform="rotate(-45.001 53.218 -.332)"/><linearGradient id="g" x1="10.58" x2="63.41" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffeaba"/><stop offset="1" stop-color="#fff6e3"/></linearGradient><path d="m19 4-2.91 2.84L42 7l3-3z" style="fill:url(#g)" transform="rotate(-45.001 53.218 -.332)"/><linearGradient id="h" x1="19.74" x2="52.25" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f0ab06"/><stop offset="1" stop-color="#fbb50d"/></linearGradient><path d="M16.09 6.84v4.31L42 11V7z" style="fill:url(#h)" transform="rotate(-45.001 53.218 -.332)"/><linearGradient id="i" x1="129.35" x2="124.48" y1="27.64" y2="47.37" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a52a04"/><stop offset="1" stop-color="#fdb44b"/></linearGradient><path d="M16.09 11.15 19 14h26l-3-3z" style="fill:url(#i)" transform="rotate(-45.001 53.218 -.332)"/><linearGradient id="j" x1="69.23" x2="69.23" y1="1.9" y2="14.09" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffeaee"/><stop offset=".776" stop-color="#d17c8a"/><stop offset="1" stop-color="#da9faa"/></linearGradient><path d="M51 4s-3 1-3 5 3 5 3 5h-4s-3-1-3-5 3-5 3-5z" style="fill:url(#j)" transform="rotate(-45.001 53.218 -.332)"/><linearGradient id="k" x1="114.68" x2="114.6" y1="3.18" y2="19.44" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe3e8"/><stop offset="1" stop-color="#f8a1b1"/></linearGradient><path d="M51 4s3 1 3 5-3 5-3 5-3-1-3-5 3-5 3-5" style="fill:url(#k)" transform="rotate(-45.001 53.218 -.332)"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Vision.svg b/static/images/App_Vision.svg
new file mode 100644
index 000000000..a84217a9b
--- /dev/null
+++ b/static/images/App_Vision.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M34 64h11c5 0 6-1 11-2 7.84-1.57 7-4 4-6-3.44-2.29 2.56-1.87 1-5-1-2-9-4-9-4l-10 9z" style="fill:#010101;fill-opacity:.4235"/><path d="M22 21v17l2 2v17l4 2h2v1l4 2 6-6V42l2-2V23l-13-6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(10 -6)"/><linearGradient id="a" x1="96.6" x2="124.61" y1="-47.07" y2="-15.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ee9bb0"/><stop offset="1" stop-color="#cc5876"/></linearGradient><path d="M22 21v16l2 3v17l4 2h2v1l4 2V45h2V27z" style="fill:url(#a)" transform="translate(10 -6)"/><linearGradient id="b" x1="-37.97" x2="-18.83" y1="-32.98" y2="-50.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe3ea"/><stop offset=".996" stop-color="#f0a8bb"/></linearGradient><path d="m22 21 14 6 6-4-10-1 3.99-2.01L29 17z" style="fill:url(#b)" transform="translate(10 -6)"/><linearGradient id="c" x1="57.23" x2="78.84" y1="-50.61" y2="-43.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a02646"/><stop offset="1" stop-color="#d53961"/></linearGradient><path d="M36 45h-2v17l6-6V42l2-2V23l-6 4z" style="fill:url(#c)" transform="translate(10 -6)"/><path d="M34 45v6l6-9-4 3z" style="fill:#71152d" transform="translate(10 -6)"/><linearGradient id="d" x1="30.92" x2="41.07" y1="-67" y2="-67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ab123a"/><stop offset="1" stop-color="#dd718d"/></linearGradient><path d="m32 22 10 1-6-3z" style="fill:url(#d)" transform="translate(10 -6)"/><path d="M32 8c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(12 -6)"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.2957 0 0 .2631 28.553 8.474)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".899" stop-color="#e4dc06"/></radialGradient><path d="M32 8c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6" style="fill:url(#e)" transform="translate(12 -6)"/><path d="M22 21v17l2 2v17l4 2h2v1l4 2 6-6V42l2-2V23l-13-6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(-16 -6)"/><linearGradient id="f" x1="85.74" x2="128.61" y1="-57.07" y2="-8.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d5dcff"/><stop offset="1" stop-color="#9d9bd5"/></linearGradient><path d="M22 21v16l2 3v17l4 2h2v1l4 2V45h2V27z" style="fill:url(#f)" transform="translate(-16 -6)"/><linearGradient id="g" x1="-37.97" x2="-18.83" y1="-32.98" y2="-50.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".996" stop-color="#a4a3d7"/></linearGradient><path d="m22 21 14 6 6-4-10-1 3.99-2.01L29 17z" style="fill:url(#g)" transform="translate(-16 -6)"/><linearGradient id="h" x1="56.23" x2="77.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#373583"/><stop offset="1" stop-color="#6967c0"/></linearGradient><path d="M36 45h-2v17l6-6V42l2-2V23l-6 4z" style="fill:url(#h)" transform="translate(-16 -6)"/><path d="M34 45v6l6-9-4 3z" style="fill:#252382" transform="translate(-16 -6)"/><linearGradient id="i" x1="30.92" x2="41.07" y1="-66" y2="-66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#33318c"/><stop offset="1" stop-color="#a4a3d7"/></linearGradient><path d="m32 22 10 1-6-3z" style="fill:url(#i)" transform="translate(-16 -6)"/><path d="M32 8c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(-16 -6)"/><radialGradient id="j" cx="0" cy="0" r="64" gradientTransform="matrix(.2957 0 0 .2631 28.553 8.474)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".899" stop-color="#e4dc06"/></radialGradient><path d="M32 8c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6" style="fill:url(#j)" transform="translate(-16 -6)"/><path d="M28 13h2m-2-4h2" style="fill:none;stroke:#000;stroke-width:2" transform="translate(12 -4)"/><path d="M44.5 11V5.5s3-.29 3 1.5c0 1.84-2.5 1.5-2.5 1.5" style="fill:none;stroke:#000;stroke-width:1"/><linearGradient id="k" x1="56.23" x2="77.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#373583"/><stop offset="1" stop-color="#6967c0"/></linearGradient><path d="M28 59h2V45l-2-1z" style="fill:url(#k)" transform="translate(-16 -6)"/><path d="M22 21v17l2 2v17l4 2h2v1l4 2 6-6V42l2-2V23l-13-6z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="l" x1="85.74" x2="128.61" y1="-57.07" y2="-8.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffdb97"/><stop offset="1" stop-color="#fcaf29"/></linearGradient><path d="M22 21v16l2 3v17l4 2h2v1l4 2V45h2V27z" style="fill:url(#l)"/><linearGradient id="m" x1="-37.97" x2="-18.83" y1="-32.98" y2="-50.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff7ea"/><stop offset=".996" stop-color="#fdd17b"/></linearGradient><path d="m22 21 14 6 6-4-10-1 3.99-2.01L29 17z" style="fill:url(#m)"/><linearGradient id="n" x1="55.23" x2="76.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85805"/><stop offset="1" stop-color="#f06306"/></linearGradient><path d="M36 45h-2v17l6-6V42l2-2V23l-6 4z" style="fill:url(#n)"/><path d="M34 45v6l6-9-4 3z" style="fill:#a32904"/><linearGradient id="o" x1="29.92" x2="40.07" y1="-66" y2="-66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85804"/><stop offset="1" stop-color="#dc952f"/></linearGradient><path d="m32 22 10 1-6-3z" style="fill:url(#o)"/><path d="M32 4c-4 0-8 4-8 8s4 8 8 8 8-4 8-8-4-8-8-8z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="p" cx="0" cy="0" r="64" gradientTransform="matrix(.2957 0 0 .2631 28.553 8.474)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".899" stop-color="#e4dc06"/></radialGradient><path d="M32 4c-4 0-8 4-8 8s4 8 8 8 8-4 8-8-4-8-8-8" style="fill:url(#p)"/><linearGradient id="q" x1="55.23" x2="76.84" y1="-51.61" y2="-44.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85805"/><stop offset="1" stop-color="#f06306"/></linearGradient><path d="M28 59h2V45l-2-1z" style="fill:url(#q)"/><path d="M28 13h2m-2-4h2" style="fill:none;stroke:#000;stroke-width:2"/><path d="M28 9h2" style="fill:none;stroke:#000;stroke-width:2" transform="translate(-16 -4)"/><path d="M32 7s4 1 4 5-4 5-4 5 2-3 2-5-2-5-2-5m-1.91 3.56s-.43 2.35-.89 3.27c-.53 1.07-1.49 2.23-1.49 2.23v-5.5z" style="fill:#000" transform="matrix(.9375 0 0 .7375 -14 -.787)"/><path d="M32 7s4 1 4 5-4 5-4 5 2-3 2-5-2-5-2-5" style="fill:#000"/></svg>
\ No newline at end of file
diff --git a/static/images/App_Vision_32.png b/static/images/App_Vision_32.png
deleted file mode 100644
index f910e95bc..000000000
Binary files a/static/images/App_Vision_32.png and /dev/null differ
diff --git a/static/images/Device_Harddisk.svg b/static/images/Device_Harddisk.svg
new file mode 100644
index 000000000..f59986227
--- /dev/null
+++ b/static/images/Device_Harddisk.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M36 61h5l23-31-6-3 1 4z" style="fill:#010101;fill-opacity:.5019"/><path d="M2 28v13l34 18 22-29V17L25 5z" style="fill:none;stroke:#010000;stroke-width:4"/><linearGradient id="a" x1="13.84" x2="58.34" y1="-38.14" y2="-27.7" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#d3d3d3"/></linearGradient><path d="m2 28 34 15 22-26L25 5z" style="fill:url(#a)"/><linearGradient id="b" x1="44.72" x2="86.1" y1="-7.9" y2="10.51" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#474747"/><stop offset="1" stop-color="#a5a0a0"/></linearGradient><path d="M36 43v16l22-29V17z" style="fill:url(#b)"/><linearGradient id="c" x1="22.97" x2="-14.6" y1="92.59" y2="67.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7d7d7d"/><stop offset="1" stop-color="#d4d4d4"/></linearGradient><path d="M2 28v13l34 18V43z" style="fill:url(#c)"/><linearGradient id="d" x1="32.05" x2="43.48" y1="9.68" y2="24.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#596756"/><stop offset="1" stop-color="#ebb2b2"/></linearGradient><path d="m7 35 5.75 2.5" style="fill:none;stroke:url(#d);stroke-width:5;stroke-linecap:round"/><path d="m6 35 3 1" style="fill:none;stroke:red;stroke-width:2" transform="translate(4 1.5)"/><path d="m6 35 3 1" style="fill:none;stroke:#a7ff00;stroke-width:2" transform="translate(0 -.25)"/></svg>
\ No newline at end of file
diff --git a/static/images/File_Archive.svg b/static/images/File_Archive.svg
new file mode 100644
index 000000000..3d970c53f
--- /dev/null
+++ b/static/images/File_Archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M36 59h5s4.5-3.38 7.12-6.92c2.91-3.91 3.96-8.03 3.96-8.03s4.98-4.01 7.96-8.03C63.02 32.01 63 28 63 28l-4-2-2 5z" style="fill:#010101;fill-opacity:.5333"/><path d="M3 28s-1 2.47-1 5.25c0 3.61.62 7.37.62 7.37s2.35 1.95 5.61 3.68c3.97 2.1 8.38 3.43 8.38 3.43l.01-13.86L29.5 20.75s-4.05-1.65-7.84-3.2c-3.37-1.38-6.55-1.67-6.55-1.67s-4.07 2.07-7.24 5.24C4.49 24.5 3 28 3 28zm27-8.25 8.93-9.69s-3.86-1.4-7.51-2.73C28.13 6.13 25 6 25 6s-1.73.72-3.63 2.62l-4.88 4.88zm1.5 1.62L47.87 27l.05 14.96s3.92-3.85 6.44-7.18c1.93-2.54 2.64-5.16 2.64-5.16s1-3.67 1-7.25c0-2.84-1.75-4.87-1.75-4.87s-4.04-2.61-8.92-4.38c-3.54-1.29-6.61-1.91-6.61-1.91s-2.05 1.44-4.32 3.58c-2.79 2.64-4.9 6.58-4.9 6.58zM46.62 29s-4.2-2.15-8.65-4.06c-3.97-1.7-7.47-2.69-7.47-2.69s-2.91 2.24-5.72 5.29c-3.16 3.43-6.16 7.08-6.16 7.08s-.38 2.97-.38 6.26c0 4.1.63 8.59.63 8.59s3.28 2.19 7.43 4.39c4.69 2.49 9.7 3.39 9.7 3.39s3.12-2.38 6.12-6.33c2.76-3.63 4.65-7.25 4.65-7.25s.46-3.59.43-7.31c-.04-3.74-.58-7.36-.58-7.36z" style="fill:none;stroke:#010000;stroke-width:4"/><linearGradient id="a" x1="13.84" x2="58.34" y1="-38.14" y2="-27.7" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff8ea"/><stop offset="1" stop-color="#f5deac"/></linearGradient><path d="M46.62 29s-4.2-2.15-8.65-4.06c-3.97-1.7-7.47-2.69-7.47-2.69s-2.91 2.24-5.72 5.29c-3.16 3.43-6.16 7.08-6.16 7.08L36 42s3.67-3.28 6.34-6.54c2.64-3.24 4.28-6.46 4.28-6.46M3 28l13.62 5.87L29.5 20.75s-4.05-1.65-7.84-3.2c-3.37-1.38-6.55-1.67-6.55-1.67s-4.07 2.07-7.24 5.24C4.49 24.5 3 28 3 28m27-8.25 8.93-9.69s-3.86-1.4-7.51-2.73C28.13 6.13 25 6 25 6s-1.73.72-3.63 2.62l-4.88 4.88zm1.5 1.62L47.87 27s3.47-2.81 5.73-5.37c1.9-2.15 2.65-4.13 2.65-4.13s-4.04-2.61-8.92-4.38c-3.54-1.29-6.61-1.91-6.61-1.91s-2.05 1.44-4.32 3.58c-2.79 2.64-4.9 6.58-4.9 6.58" style="fill:url(#a)"/><linearGradient id="b" x1="44.72" x2="86.1" y1="-7.9" y2="10.51" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#983f04"/><stop offset="1" stop-color="#e6c276"/></linearGradient><path d="M46.62 29s-1.64 3.22-4.28 6.46C39.67 38.72 36 42 36 42v15.25s3.12-2.38 6.12-6.33c2.76-3.63 4.65-7.25 4.65-7.25s.46-3.59.43-7.31c-.04-3.74-.58-7.36-.58-7.36m1.25-2 .05 14.96s3.92-3.85 6.44-7.18c1.93-2.54 2.64-5.16 2.64-5.16s1-3.67 1-7.25c0-2.84-1.75-4.87-1.75-4.87s-.75 1.98-2.65 4.13C51.34 24.19 47.87 27 47.87 27" style="fill:url(#b)"/><linearGradient id="c" x1="17.72" x2="-10.6" y1="90.92" y2="71.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eebf5a"/><stop offset="1" stop-color="#ffebc0"/></linearGradient><path d="m36 42-17.38-7.38s-.38 2.97-.38 6.26c0 4.1.63 8.59.63 8.59s3.28 2.19 7.43 4.39c4.69 2.49 9.7 3.39 9.7 3.39z" style="fill:url(#c)"/><path d="M37 31s-6-14-10-16-16 5-9 6 24-7 28-4 5 4 1 4c-1.58 0-16-1-16-1s-2.63.67-7 3.25c-4.12 2.42-9 4-9 4" style="fill:none;stroke:#010000;stroke-width:2"/><linearGradient id="d" x1="2.85" x2="21.14" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffefce"/><stop offset="1" stop-color="#ffd16e"/></linearGradient><path d="M3 28s-1 2.47-1 5.25c0 3.61.62 7.37.62 7.37s2.35 1.95 5.61 3.68c3.97 2.1 8.38 3.43 8.38 3.43l.01-13.86z" style="fill:url(#d)"/></svg>
\ No newline at end of file
diff --git a/static/images/File_Generic.svg b/static/images/File_Generic.svg
new file mode 100644
index 000000000..ae36ab319
--- /dev/null
+++ b/static/images/File_Generic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m27 57 2 2 3.13-3.17L37 59l8.39-11.46L64 38l-5-3 2 2-25 12zm31-23 4-3-4-2-3 3z" style="fill:#010101;fill-opacity:.5725"/><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:none;stroke:#010101;stroke-width:4"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.5714 0 0 .3333 26 35)" gradientUnits="userSpaceOnUse"><stop offset=".489" stop-color="#896eff"/><stop offset="1" stop-color="#c0d5ff"/></radialGradient><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:url(#a)"/><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:none;stroke:#010101;stroke-width:4"/><linearGradient id="b" x1="105.45" x2="119.92" y1="-23.42" y2="34.32" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a5b1ff"/><stop offset=".739" stop-color="#eaf1ff"/><stop offset="1" stop-color="#b3b8ff"/></linearGradient><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:url(#b)"/></svg>
\ No newline at end of file
diff --git a/static/images/File_HTML.svg b/static/images/File_HTML.svg
new file mode 100644
index 000000000..108475645
--- /dev/null
+++ b/static/images/File_HTML.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m27 57 2 2 3.13-3.17L37 59l8.39-11.46L64 38l-5-3 2 2-25 12zm31-23 4-3-4-2-3 3z" style="fill:#010101;fill-opacity:.5725" transform="translate(0 3)"/><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:none;stroke:#010101;stroke-width:4" transform="translate(0 3)"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.5714 0 0 .3333 26 35)" gradientUnits="userSpaceOnUse"><stop offset=".489" stop-color="#f1b706"/><stop offset="1" stop-color="#fffcc0"/></radialGradient><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:url(#a)" transform="translate(0 3)"/><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:none;stroke:#010101;stroke-width:4" transform="translate(0 3)"/><linearGradient id="b" x1="107.04" x2="118.33" y1="-17.09" y2="27.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffefa5"/><stop offset=".742" stop-color="#fffcc0"/><stop offset="1" stop-color="#fff890"/></linearGradient><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:url(#b)" transform="translate(0 3)"/><linearGradient id="c" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m20 36 14.87-15.13M14 32l12.87-13M26 40l12.75-13.13M32 44l10.75-11.63" style="fill:none;stroke:url(#c);stroke-width:1" transform="translate(0 3)"/><linearGradient id="d" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m29 42 15-15.63M23 38l11.75-11.75M17 34l11.12-11.38" style="fill:none;stroke:url(#d);stroke-width:1" transform="translate(0 3)"/><path d="M32.02 1.91c10.01 0 18.12 8.11 18.12 18.12s-8.11 18.12-18.12 18.12S13.9 30.04 13.9 20.03 22.01 1.91 32.02 1.91z" style="fill:none;stroke:#010101;stroke-width:4"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.3803 0 0 -.3803 23.532 21.015)" gradientUnits="userSpaceOnUse"><stop offset=".193" stop-color="#3ff"/><stop offset=".788" stop-color="#06f"/><stop offset="1" stop-color="#0034cc"/></radialGradient><path d="M32.02 1.91c10.01 0 18.12 8.11 18.12 18.12s-8.11 18.12-18.12 18.12S13.9 30.04 13.9 20.03 22.01 1.91 32.02 1.91" style="fill:url(#e)"/><radialGradient id="f" cx="0" cy="0" r="64" gradientTransform="matrix(.3803 0 0 -.3803 23.532 17.015)" gradientUnits="userSpaceOnUse"><stop offset=".33" stop-color="#09b4b6"/><stop offset=".85" stop-color="#033784"/><stop offset="1" stop-color="#051d61"/></radialGradient><path d="M47.33 10.33C44.65 6.1 40.23 3.11 35.3 2.2c-1.08-.19-2.18-.29-3.28-.29-5.08 0-10.01 2.18-13.42 5.95a18.22 18.22 0 0 0-4.51 14.77c.41 2.49.66 3.24 1.32 4.65 1.82 4.16 5.22 7.55 9.38 9.37 4.75 2.07 10.3 1.98 14.98-.24-.19-.87-.93-.9-1.66-.97h-.08l.26.06c-.58-.13-1.11.13-1.65.29-.63.19-1.29.1-1.93.03-1.29-.15-2.87-.4-3.94.52h-3.34c-.52-.37-1.01-.47-1.48-.51-.03-.03-.24-.27-.24-.27-.13-.15-.24-.24-.42-.3l-1.09-.37-1.13-.42c-.1-.03-.2-.04-.3-.05-.02-.04-.01-.09-.04-.13l-.25-.39c-.33-.58-.7-1.16-1.39-1.3.09-.38-.04-.7-.15-1.06-.12-.39-.15-.81-.13-1.22l.03-.36c.04-.51.07-1.01-.01-1.51.8-.89.98-1.8.91-2.97l-.02-.43c0-.63 0-.71.2-.98l.11-.14c.56-.74 1.45-2.23.27-2.88l-2.94-1.6s-.38-.17-.43-.2v-.02c-.02-.86-.32-1.46-1.01-1.97l-.18-.13c0-.01-.25-.34-.25-.34l-.73-.87c-.47-.44-.91-.58-1.31-.61-.03-.08-.08-.16-.13-.23 1.03-.43 1.51-1.58 1.91-2.54.24-.57.44-1.18.87-1.64.39-.43.75-.8.65-1.43.82-.32 1.57-.74 2.28-1.16l.1-.06 1.44-.89c1.01-.6 1.47-1.42 1.8-2.53.62.06 1.17-.09 1.59-.31.78.47 2.05.49 2.71-.2.03 0 .15-.01.27-.02-.38.79 0 1.88.87 2.2.03.04.04.11.08.14l-.34.12-.8.9c-.18.55 0 1.12.27 1.61.01.02.02.08.02.08.02.1.05.24.1.4-.08.1-.16.18-.16.18-.8.97-2.09 1.19-2.45 2.53l-.05.18c-.41.53-.51 1.17-.14 1.76-.04.07-.07.14-.07.14-.33.6-.61 1.29-.42 1.97.19.67.74 1.16 1.25 1.59.5.43 1.01.87 1.64 1.11.73.28 1.55.22 2.3.03l.77-.24c.35-.12.71-.3 1.09-.26.41.04.72.36 1.02.62-.54 1.36.49 2.71 1.1 3.88 0 0 .14.23.18.3-.75 1.36-.83 2.86.32 4l.11.12c-.01 1.11.02 3.07 1.44 3.41 1.45.34 2.91-.47 3.79-1.57l.35-.41.28-.22c.31-.22.64-.48.82-.82.18-.36.2-.8.45-1.13v.01c.03.7.69 1.2 1.37 1.08.84-.14 1.35-1.04 1.69-1.73l.15-.3.04-.07c.41-.71.71-1.6.19-2.34-.45-.64-1.33-.81-1.94-.28v-.41l.03-1.3c.02-.19.43-.59.65-.81l.22-.21.23-.21c.46-.4.9-.84 1.06-1.45.1-.26.04-.7.06-.98l-.01-.2.01-.1c.05-.59-.04-1.19-.51-1.6.53-.32.9-.86 1.07-1.54.03.05.09.18.09.18.15.3.34.66.68.98-.05.75.22 1.45.55 2.1.33.64.4 1.35.39 2.06l.02.71c.02.37.06.76-.04 1.13-.09.34-.27.65-.36.99-.22.78-.28 1.6-.28 2.41-.11.66.27 1.3.81 1.51 2.05-5.31 1.45-11.41-1.6-16.22" style="fill:url(#f)"/><radialGradient id="g" cx="0" cy="0" r="64" gradientTransform="translate(26.492 10.436)scale(.4477)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".299" stop-color="#0f0"/><stop offset=".564" stop-color="#00b200"/><stop offset="1" stop-color="green"/></radialGradient><path d="M19.58 28.17c.29-.39.68-.71.9-1.15.26-.55.11-1.38.11-1.97 0-.69 0-1.08.43-1.66.31-.43.64-.8.73-1.35-.97-.53-1.94-1.07-2.92-1.59-.25-.13-.82-.29-.95-.58-.16-.39 0-.89-.19-1.26-.14-.29-.59-.49-.81-.75-.3-.36-.54-.78-.89-1.11-.34-.31-.66-.46-1.09-.23-.47.26-.44-.45-.49-.76-.12.51-.23 1.03-.31 1.55.42 0 .37.12.38.52s.02.8.04 1.21c.07.17.02.26-.15.26-.05.02-.1.04-.16.06-.1.08-.17.07-.22-.03-.16-.01-.05 1.77-.04 1.92.04.57-.02 2.39.81 2.11.43.29.36.99.65 1.4.34.49.78.74.96 1.35.17.62.18 1.27.28 1.9.13.79.56 1.07 1.14 1.55.14.82.38 1.33.93 1.96.25.28.5.56.73.86.24.31.35.3.59-.03-.31-.64-.4-1.38-.36-2.09.04-.68.19-1.45-.1-2.09m6.44-25.04c.34.23.37.45.81.53.31.06.79.13 1.03-.13.58-.6 1.48-.17 2.16-.59.54-.33.99-1 1.69-1 .43-.01.69.26 1.04.45.47.26.85-.23 1.28-.37-3.34-.37-6.76.2-9.81 1.65.68.2 1.28-.13 1.8-.54m4.62 2.69c.31.02.68.24.99.11.5-.2.02-.96-.19-1.18-.15-.16-.87-.88-.73-.24.09.43.46 1.02-.07 1.31M17.63 9.8c.06-.23-.08-.32-.23-.47a18.2 18.2 0 0 0-2.5 4.76c1.4-1.09 1.29-3.19 2.73-4.29m32.48 9.14c-.26-2.77-1.06-5.5-2.43-7.94-.69-1.24-1.53-2.4-2.51-3.43q-.72-.765-1.53-1.44c-.17-.14-.35-.39-.58-.26-.21.11-.38-.29-.32-.45a18.2 18.2 0 0 0-8.07-3.32c.42.29.95.26 1.4.45.16.06.63.32.25.44-.74.25-1.58-.05-2.34 0-.47.04-.69.2-.73.68-.02.26-.09.77.01 1.02.11.29 1.01-.07 1.15-.23.23-.27-.05-.85.58-.67.23.47.72 1.83-.33 1.47-.26-.09-.75-.52-1.03-.39-.02.01-.07.34-.09.38-.09.16-.25.27-.43.32-.74.2-1.27.31-1.54 1.11-.13.39-.12.63-.55.78-.32.11-.68.18-.99.33-.42.2-.13.75.03 1.03.11.2.09.67.3.79.63.36 1.36-1.04 1.62-1.37.34-.45.73-.34 1.2-.5.22-.07.51-.63.74-.54.78.3 1.01 1.23 1.13 1.96.25 0 .09-.59.61-.46-.39-.42-.66-.98-.72-1.56.56.36.95.75 1.13 1.38.17.62.46.97.97.34.13-.13.31-.97.58-.73.23.2.23.88-.12.97.2.18.48.1.71.04.32-.08.5-.06.8.06.35.13.72.18 1.09.2s.58.36.75.64c.47.77-2.33.45-2.47.44-.34-.02-.72-.02-1.03.1-.24.1-.42.42-.71.32-.32-.1-.61-.39-.89-.57a8 8 0 0 0-1.19-.66c-.69-.31-1.47-.5-2.22-.35-.35.08-.69.23-.98.45-.35.26-.73.03-1.07.39-.53.54-.9 1.2-1.6 1.54-.29.14-.63.26-.83.51-.21.26-.21.61-.35.9-.13.28-.43.42-.19.75.21.29.27.52.12.86-.21.51-.79 1.19-.37 1.74.4.54 1.11 1.07 1.64 1.46.61.45 1.36.4 2.05.22.64-.17 1.29-.48 1.96-.53.84-.06 1.48.47 2.07 1 .39.35.54.49.24.98-.33.56-.13.96.14 1.5s.56 1.08.84 1.6c.13.23.3.44.4.68.12.28-.07.44-.2.68-.27.48-.46 1.03-.46 1.59.01.62.3.83.69 1.23.36.36.34 1 .31 1.47-.05.65.15 1.1.53 1.61.58.03 1.18-.01 1.71-.26.65-.31.93-.91 1.42-1.4.45-.45.92-.49 1.06-1.18.16-.81.59-1.13 1.18-1.63.54-.46.47-1.12.49-1.76.01-.74-.07-1.55.02-2.29.09-.67.74-1.21 1.19-1.66.33-.34.88-.67 1-1.16.07-.26.01-.61.01-.89 0-.2.07-.53-.02-.72-.24-.52-1.32-.01-1.44-.49-.08-.29-.06-.24.13-.42.22-.2 0-.4-.19-.51-.52-.31-.94-.51-1.32-1.02-.36-.47-.66-.99-.95-1.51-.07-.13-.77-1.54-.36-1.41.45.15.86.68 1.17 1.02.53.58 1.02 1.23 1.35 1.94.01.09.34.27.41.32.24.18.51.32.82.3.71-.06 1.05-.7 1.1-1.34.07-.87-.6-.69-1.12-1.1-.29-.24-.49-.57-.72-.86-.15-.17-.55-.45-.41-.73.3-.2.42-.02.71.15.34.21.71.39 1.09.51.4.13.99.01 1.33.27.21.15.36.52.5.74q.345.525.63 1.08c.29.58.37.97 1.07 1.18-.44.73-.01 1.58.33 2.24.41.8.45 1.57.44 2.45-.01.8.18 1.72-.19 2.47-.39.82-.47 1.93-.47 2.84.01-.05.03-.13.06-.18-.04.07-.16.53-.05.55.17.04.48-1.67.52-1.87.32-1.53.42-3.11.33-4.68M40.17 8.15c-.27.04-.25-.4-.44-.5-.35-.18-.75.03-1.05.19-.99.54-.71-.59-.5-1.14.03-.09.67.02.77.01.33-.05.82-.19 1.08.1.24.28.43.55.71.81.36.32-.31.5-.57.53m4.89 15.91c-.33.4-.77.7-1.02 1.16-.3.52-.15 1.14-.15 1.71.56-.26.81-1.01 1.1-1.51.21-.37.67-1.1.07-1.36m-7.23 12.48c-1.45 1.03-3.66.11-5.3.29-.37.04-.73.11-1.02.37-.38.33-.55.27-1.08.27H27.1c2.4.67 4.94.85 7.41.51a18.7 18.7 0 0 0 3.46-.81c.09-.03.94-.48.63-.59-.24-.09-.54.06-.77-.04M22.76 5.77c.32-.52.52-1.1.66-1.69a18.2 18.2 0 0 0-5.43 4.49c.91-.3 1.74-.81 2.56-1.3.4-.24.8-.48 1.19-.73.33-.21.81-.44 1.02-.77m-1.86 27.9c-.14.11-.27.26-.45.3.46.39.95.75 1.45 1.09-.39-.42-.53-1.03-1-1.39" style="fill:url(#g)"/></svg>
\ No newline at end of file
diff --git a/static/images/File_HTML_32.png b/static/images/File_HTML_32.png
deleted file mode 100644
index 1de487822..000000000
Binary files a/static/images/File_HTML_32.png and /dev/null differ
diff --git a/static/images/File_IDE_Project.svg b/static/images/File_IDE_Project.svg
new file mode 100644
index 000000000..1523e7d6b
--- /dev/null
+++ b/static/images/File_IDE_Project.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m27 57 2 2 3.13-3.17L37 59l8.39-11.46L64 38l-5-3 2 2-25 12zm31-23 4-3-4-2-3 3z" style="fill:#010101;fill-opacity:.5725"/><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:none;stroke:#010101;stroke-width:4"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.5714 0 0 .3333 26 35)" gradientUnits="userSpaceOnUse"><stop offset=".489" stop-color="#f1b706"/><stop offset="1" stop-color="#fffcc0"/></radialGradient><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:url(#a)"/><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:none;stroke:#010101;stroke-width:4"/><linearGradient id="b" x1="107.04" x2="118.33" y1="-17.09" y2="27.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffefa5"/><stop offset=".742" stop-color="#fffcc0"/><stop offset="1" stop-color="#fff890"/></linearGradient><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:url(#b)"/><linearGradient id="c" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m20 36 14.87-15.13M14 32l12.87-13M26 40l12.75-13.13M32 44l10.75-11.63" style="fill:none;stroke:url(#c);stroke-width:1"/><linearGradient id="d" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m29 42 15-15.63M23 38l11.75-11.75M17 34l11.12-11.38" style="fill:none;stroke:url(#d);stroke-width:1"/><path d="M16.3 28.01c-2.33.11-4.5.86-6.35 2.04 0 0-.05 1.24.49 2.08l1.09 1.71a8.83 8.83 0 0 0-3.05 4.2l-1.92-.5c-.96-.25-2.13.15-2.13.15-.28 1.03-.41 2.14-.41 3.26 0 1.2.15 2.34.44 3.43 0 0 1.16.41 2.14.14l1.92-.53a9 9 0 0 0 3.03 4.12l-1.08 1.68c-.53.84-.49 2.09-.49 2.09 1.84 1.18 4 1.91 6.33 2.02 0 0 .73-.95.78-1.95l.09-2.02c1.82-.03 3.5-.62 4.91-1.57l1.25 1.55c.63.77 1.81 1.13 1.81 1.13 1.73-1.41 3.1-3.25 3.94-5.39 0 0-.69-.97-1.62-1.34l-1.88-.75c.25-.81.38-1.7.38-2.59 0-.88-.11-1.71-.34-2.52l1.86-.69c.94-.36 1.64-1.39 1.64-1.39-.8-2.15-2.18-4.03-3.93-5.45 0 0-1.16.36-1.8 1.13l-1.25 1.57A8.9 8.9 0 0 0 17.18 32l-.09-2.03c-.03-1-.78-1.96-.78-1.96zM20 41c0 1.65-1.35 3-3 3s-3-1.35-3-3c0-1.66 1.34-3 3-3 1.65 0 3 1.34 3 3z" style="fill:none;stroke:#010101;stroke-width:4"/><linearGradient id="e" x1="21.96" x2="57.17" y1="-.01" y2="22.58" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fdfdfd"/><stop offset="1" stop-color="#8d8d8d"/></linearGradient><path d="M16.3 28.01c-2.33.11-4.5.86-6.35 2.04 0 0-.05 1.24.49 2.08l1.09 1.71a8.83 8.83 0 0 0-3.05 4.2l-1.92-.5c-.96-.25-2.13.15-2.13.15-.28 1.03-.41 2.14-.41 3.26 0 1.2.15 2.34.44 3.43 0 0 1.16.41 2.14.14l1.92-.53a9 9 0 0 0 3.03 4.12l-1.08 1.68c-.53.84-.49 2.09-.49 2.09 1.84 1.18 4 1.91 6.33 2.02 0 0 .73-.95.78-1.95l.09-2.02c1.82-.03 3.5-.62 4.91-1.57l1.25 1.55c.63.77 1.81 1.13 1.81 1.13 1.73-1.41 3.1-3.25 3.94-5.39 0 0-.69-.97-1.62-1.34l-1.88-.75c.25-.81.38-1.7.38-2.59 0-.88-.11-1.71-.34-2.52l1.86-.69c.94-.36 1.64-1.39 1.64-1.39-.8-2.15-2.18-4.03-3.93-5.45 0 0-1.16.36-1.8 1.13l-1.25 1.57A8.9 8.9 0 0 0 17.18 32l-.09-2.03c-.03-1-.78-1.96-.78-1.96zM20 41c0 1.65-1.35 3-3 3s-3-1.35-3-3c0-1.66 1.34-3 3-3 1.65 0 3 1.34 3 3" style="fill:url(#e)"/></svg>
\ No newline at end of file
diff --git a/static/images/File_PDF.svg b/static/images/File_PDF.svg
new file mode 100644
index 000000000..c575d690d
--- /dev/null
+++ b/static/images/File_PDF.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m27 57 2 2 3.13-3.17L37 59l8.39-11.46L64 38l-5-3 2 2-25 12zm31-23 4-3-4-2-3 3z" style="fill:#010101;fill-opacity:.5725"/><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:none;stroke:#010101;stroke-width:4"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.5714 0 0 .3333 26 35)" gradientUnits="userSpaceOnUse"><stop offset=".489" stop-color="#ffc0c0"/><stop offset="1" stop-color="#f4f4f4"/></radialGradient><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:url(#a)"/><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:none;stroke:#010101;stroke-width:4"/><linearGradient id="b" x1="107.04" x2="118.33" y1="-17.09" y2="27.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e7e7e7"/><stop offset=".742" stop-color="#fff"/><stop offset="1" stop-color="#ebebeb"/></linearGradient><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:url(#b)"/><linearGradient id="c" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m33 25 5-5m-14-1 5-5m-3 26 16-17m-8 23 13-15" style="fill:none;stroke:url(#c);stroke-width:1"/><linearGradient id="d" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m30 43 16-18m-17-3 4-4" style="fill:none;stroke:url(#d);stroke-width:1"/><linearGradient id="e" x1="57.5" x2="71.09" y1="-34.42" y2="46.71" gradientUnits="userSpaceOnUse"><stop offset=".421" stop-color="#06f8b7"/><stop offset="1" stop-color="#1467ff"/></linearGradient><path d="m8 30 22 14 18-20-22-10z" style="fill:url(#e)" transform="matrix(.4749 0 0 .5 8.2 15)"/><path d="m8 30 22 14 18-20-22-10z" style="fill:none;stroke:#010101;stroke-width:1" transform="matrix(.4749 0 0 .5 8.2 15)"/><path d="M30 16V2s6 2 11 2c4 0 12-2 17-2v14c-5 0-13 2-17 2-5 0-11-2-11-2z" style="fill:none;stroke:#010101;stroke-width:4;stroke-linejoin:round"/><linearGradient id="f" x1="38.95" x2="66" y1="-23.75" y2="-12.14" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff6d6d"/><stop offset="1" stop-color="#da1c1c"/></linearGradient><path d="M30 16V2s6 2 11 2c4 0 12-2 17-2v14c-5 0-13 2-17 2-5 0-11-2-11-2" style="fill:url(#f)"/><path d="M50 14V7h4m-21 7V7s4-1 4 2-3 2-3 2m7-4v7s5 1 5-2V9c0-3-5-2-5-2m9 4h3" style="fill:none;stroke:#fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"/></svg>
\ No newline at end of file
diff --git a/static/images/File_Text.svg b/static/images/File_Text.svg
new file mode 100644
index 000000000..9c389873b
--- /dev/null
+++ b/static/images/File_Text.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="m27 57 2 2 3.13-3.17L37 59l8.39-11.46L64 38l-5-3 2 2-25 12zm31-23 4-3-4-2-3 3z" style="fill:#010101;fill-opacity:.5725"/><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:none;stroke:#010101;stroke-width:4"/><radialGradient id="a" cx="0" cy="0" r="64" gradientTransform="matrix(.5714 0 0 .3333 26 35)" gradientUnits="userSpaceOnUse"><stop offset=".489" stop-color="#f1b706"/><stop offset="1" stop-color="#fffcc0"/></radialGradient><path d="M6.25 30s5.62 6 10.62 12.5 9.38 13.25 9.38 13.25l32.87-18.88L32 15z" style="fill:url(#a)"/><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:none;stroke:#010101;stroke-width:4"/><linearGradient id="b" x1="107.04" x2="118.33" y1="-17.09" y2="27.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffefa5"/><stop offset=".742" stop-color="#fffcc0"/><stop offset="1" stop-color="#fff890"/></linearGradient><path d="M2.62 30.87s8.33 5.39 16.38 11c8.44 5.88 16.75 10.88 16.75 10.88l22.37-26.38s-12.68-5.67-22.75-11c-5.19-2.75-9.37-6-9.37-6z" style="fill:url(#b)"/><linearGradient id="c" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m20 36 14.87-15.13M14 32l12.87-13M26 40l12.75-13.13M32 44l10.75-11.63" style="fill:none;stroke:url(#c);stroke-width:1"/><linearGradient id="d" x1="-47.14" x2="-28.46" y1="-15.78" y2="-37.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101"/><stop offset="1" stop-color="#9e9e9e"/></linearGradient><path d="m29 42 15-15.63M23 38l11.75-11.75M17 34l11.12-11.38" style="fill:none;stroke:url(#d);stroke-width:1"/></svg>
\ No newline at end of file
diff --git a/static/images/File_Text_32.png b/static/images/File_Text_32.png
deleted file mode 100644
index 2662140a8..000000000
Binary files a/static/images/File_Text_32.png and /dev/null differ
diff --git a/static/images/File_Text_48.png b/static/images/File_Text_48.png
deleted file mode 100644
index 6e4c79713..000000000
Binary files a/static/images/File_Text_48.png and /dev/null differ
diff --git a/static/images/Folder_config.svg b/static/images/Folder_config.svg
new file mode 100644
index 000000000..04ee2abe8
--- /dev/null
+++ b/static/images/Folder_config.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M42 61h6l4-4h4l6-6-14-4z" style="fill:#010101;fill-opacity:.396"/><path d="m3 15 10 26 29 18 18-47-12-2-4 2-18-4-2 5-8-2-.09 8.2z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="102.6" x2="102.74" y1="8.5" y2="47.07" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#face79"/><stop offset="1" stop-color="#bc4105"/></linearGradient><path d="M26 8 14 41l28 17 18-46-12-2-4 2z" style="fill:url(#a)"/><linearGradient id="b" x1="103.24" x2="103.39" y1="12.68" y2="55.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#8e8e8e"/></linearGradient><path d="M16 11v30l26 16 7-35z" style="fill:url(#b)"/><linearGradient id="c" x1="78.34" x2="101.46" y1="-26.66" y2="12.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9a9a9a"/><stop offset="1" stop-color="#505050"/></linearGradient><path d="m16 11 33 11-7 35 10-36.63z" style="fill:url(#c)"/><linearGradient id="d" x1="88.52" x2="97.54" y1="9.59" y2="51.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe2ac"/><stop offset="1" stop-color="#f49806"/></linearGradient><path d="m3 15 10 26 29 18-4-29z" style="fill:url(#d)"/><path d="m3 15 35 15 4 29-1.5-31z" style="fill:#a03d03"/><path d="M14.3 35.01c-2.33.11-4.5.86-6.35 2.04 0 0-.05 1.24.49 2.08l1.09 1.71a8.83 8.83 0 0 0-3.05 4.2l-1.92-.5c-.96-.25-2.13.15-2.13.15-.28 1.03-.41 2.14-.41 3.26 0 1.2.15 2.34.44 3.43 0 0 1.16.41 2.14.14l1.92-.53a9 9 0 0 0 3.03 4.12l-1.08 1.68c-.53.84-.49 2.09-.49 2.09 1.84 1.18 4 1.91 6.33 2.02 0 0 .73-.95.78-1.95l.09-2.02c1.82-.03 3.5-.62 4.91-1.57l1.25 1.55c.63.77 1.81 1.13 1.81 1.13 1.73-1.41 3.1-3.25 3.94-5.39 0 0-.69-.97-1.62-1.34l-1.88-.75c.25-.81.38-1.7.38-2.59 0-.88-.11-1.71-.34-2.52l1.86-.69c.94-.36 1.64-1.39 1.64-1.39-.8-2.15-2.18-4.03-3.93-5.46 0 0-1.16.36-1.8 1.14l-1.25 1.57A8.9 8.9 0 0 0 15.18 39l-.09-2.03c-.03-1-.78-1.96-.78-1.96zM19 48c0 2.2-1.79 4-4 4-2.2 0-4-1.79-4-4s1.78-4 4-4c2.2 0 4 1.78 4 4z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="e" x1="21.96" x2="57.17" y1="-.01" y2="22.58" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f7f9ff"/><stop offset="1" stop-color="#989db0"/></linearGradient><path d="M14.3 35.01c-2.33.11-4.5.86-6.35 2.04 0 0-.05 1.24.49 2.08l1.09 1.71a8.83 8.83 0 0 0-3.05 4.2l-1.92-.5c-.96-.25-2.13.15-2.13.15-.28 1.03-.41 2.14-.41 3.26 0 1.2.15 2.34.44 3.43 0 0 1.16.41 2.14.14l1.92-.53a9 9 0 0 0 3.03 4.12l-1.08 1.68c-.53.84-.49 2.09-.49 2.09 1.84 1.18 4 1.91 6.33 2.02 0 0 .73-.95.78-1.95l.09-2.02c1.82-.03 3.5-.62 4.91-1.57l1.25 1.55c.63.77 1.81 1.13 1.81 1.13 1.73-1.41 3.1-3.25 3.94-5.39 0 0-.69-.97-1.62-1.34l-1.88-.75c.25-.81.38-1.7.38-2.59 0-.88-.11-1.71-.34-2.52l1.86-.69c.94-.36 1.64-1.39 1.64-1.39-.8-2.15-2.18-4.03-3.93-5.46 0 0-1.16.36-1.8 1.14l-1.25 1.57A8.9 8.9 0 0 0 15.18 39l-.09-2.03c-.03-1-.78-1.96-.78-1.96zM19 48c0 2.2-1.79 4-4 4-2.2 0-4-1.79-4-4s1.78-4 4-4c2.2 0 4 1.78 4 4" style="fill:url(#e)"/></svg>
\ No newline at end of file
diff --git a/static/images/Folder_haiku.svg b/static/images/Folder_haiku.svg
new file mode 100644
index 000000000..267349077
--- /dev/null
+++ b/static/images/Folder_haiku.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M42 61h6l4-4h4l6-6-14-4z" style="fill:#010101;fill-opacity:.396"/><path d="m3 15 10 26 29 18 18-47-12-2-4 2-18-4-2 5-8-2-.09 8.2z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="102.6" x2="102.74" y1="8.5" y2="47.07" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#face79"/><stop offset="1" stop-color="#bc4105"/></linearGradient><path d="M26 8 14 41l28 17 18-46-12-2-4 2z" style="fill:url(#a)"/><linearGradient id="b" x1="103.24" x2="103.39" y1="12.68" y2="55.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#8e8e8e"/></linearGradient><path d="M16 11v30l26 16 7-35z" style="fill:url(#b)"/><linearGradient id="c" x1="78.34" x2="101.46" y1="-26.66" y2="12.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9a9a9a"/><stop offset="1" stop-color="#505050"/></linearGradient><path d="m16 11 33 11-7 35 10-36.63z" style="fill:url(#c)"/><linearGradient id="d" x1="88.52" x2="97.54" y1="9.59" y2="51.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe2ac"/><stop offset="1" stop-color="#f49806"/></linearGradient><path d="m3 15 10 26 29 18-4-29z" style="fill:url(#d)"/><path d="m3 15 35 15 4 29-1.5-31z" style="fill:#a03d03"/><path d="M15 36s-4 4-4 11c-2-4-7-5-7-5s-1 6 5 9c0 0 0 1-6 1 0 0 3 6 11 4v4h2v-4c8 2 11-4 11-4-6 0-6-1-6-1 6-3 5-9 5-9s-5 1-7 5c0-7-4-11-4-11z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.0874 -.379 .4747 .1095 8.15 41.589)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffb11b"/><stop offset="1" stop-color="#fff9c7"/></radialGradient><path d="M15 36s-4 4-4 11c-2-4-7-5-7-5s-1 6 5 9c0 0 0 1-6 1 0 0 3 6 11 4v4h2v-4c8 2 11-4 11-4-6 0-6-1-6-1 6-3 5-9 5-9s-5 1-7 5c0-7-4-11-4-11" style="fill:url(#e)"/></svg>
\ No newline at end of file
diff --git a/static/images/Folder_mail.svg b/static/images/Folder_mail.svg
new file mode 100644
index 000000000..ded4b7864
--- /dev/null
+++ b/static/images/Folder_mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M42 61h6l4-4h4l6-6-14-4z" style="fill:#010101;fill-opacity:.396"/><path d="m3 15 10 26 29 18 18-47-12-2-4 2-18-4-2 5-8-2-.09 8.2z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="102.6" x2="102.74" y1="8.5" y2="47.07" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#face79"/><stop offset="1" stop-color="#bc4105"/></linearGradient><path d="M26 8 14 41l28 17 18-46-12-2-4 2z" style="fill:url(#a)"/><linearGradient id="b" x1="103.24" x2="103.39" y1="12.68" y2="55.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#8e8e8e"/></linearGradient><path d="M16 11v30l26 16 7-35z" style="fill:url(#b)"/><linearGradient id="c" x1="78.34" x2="101.46" y1="-26.66" y2="12.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9a9a9a"/><stop offset="1" stop-color="#505050"/></linearGradient><path d="m16 11 33 11-7 35 10-36.63z" style="fill:url(#c)"/><linearGradient id="d" x1="88.52" x2="97.54" y1="9.59" y2="51.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe2ac"/><stop offset="1" stop-color="#f49806"/></linearGradient><path d="m3 15 10 26 29 18-4-29z" style="fill:url(#d)"/><path d="m3 15 35 15 4 29-1.5-31z" style="fill:#a03d03"/><path d="M4 44v16h24V44z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="e" x1="39.68" x2="50.16" y1="23.96" y2="47.48" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#d9d093"/></linearGradient><path d="M4 44v16h24V44z" style="fill:url(#e)"/><path d="M4 44s10 8 12 8 12-8 12-8-3.43 4.79-7.72 8L28 60l-8.58-7.21C17.71 54.4 16.71 54 16 54c-.72 0-1.72.4-3.43-1.21L4 60l7.71-8C7.42 48.79 4 44 4 44" style="fill:#6b5222"/></svg>
\ No newline at end of file
diff --git a/static/images/Folder_mail_32.png b/static/images/Folder_mail_32.png
deleted file mode 100644
index f3ad2f5f9..000000000
Binary files a/static/images/Folder_mail_32.png and /dev/null differ
diff --git a/static/images/Misc_Marker.svg b/static/images/Misc_Marker.svg
new file mode 100644
index 000000000..0d540984e
--- /dev/null
+++ b/static/images/Misc_Marker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><linearGradient id="a" x1="0" x2="8" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fbff00" stop-opacity="0"/><stop offset="1" stop-color="#fbff00"/></linearGradient><path d="M0 48v6h24v-6z" style="fill:url(#a)"/><path d="M20 40s0 1 1 2c4 2 6 7 6 10h1v8l8-4v-4h1c0-3 2-8 6-10 1-1 1-2 1-2 0-4-2-32-4-34s-4-2-8-2-6 0-8 2-4 30-4 34z" style="fill:none;stroke:#010101;stroke-width:4" transform="rotate(45.001 35 39.86)"/><radialGradient id="b" cx="0" cy="0" r="64" gradientTransform="matrix(.3125 0 0 .875 24 8)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffea00"/><stop offset="1" stop-color="#fa0"/></radialGradient><path d="M20 40c0 2 6.03 3 12 3 6.03 0 12-1 12-3 0-4-2-32-4-34s-4-2-8-2-6 0-8 2-4 30-4 34" style="fill:url(#b)" transform="rotate(45.001 35 39.86)"/><linearGradient id="c" x1="15.92" x2="22.92" y1="37.42" y2="33.53" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff0"/><stop offset="1" stop-color="#ffbf00"/></linearGradient><path d="m28 60 8-4v-4h-8z" style="fill:url(#c)" transform="rotate(45.001 35 39.86)"/><path d="M27 52s2 1 5 1 5-1 5-1c0-3 2-8 6-10 1-1 1-2 1-2 0 2-6 3-12 3s-12-1-12-3c0 0 0 1 1 2 4 2 6 7 6 10" style="fill:#010101" transform="rotate(45.001 35 39.86)"/><path d="M22 38s2-30 3-31c2 2 12 2 13 0 0 3-10 3-10 3l-2 30c-2 0-4-1-4-2" style="fill:#fdff97" transform="rotate(45.001 35 39.86)"/><path d="m28 51 2 1-2-7s3 0 5-2c-4 1-9 0-9 0 2 2 4 6 4 8" style="fill:#b9b9b9" transform="rotate(45.001 35 39.86)"/></svg>
\ No newline at end of file
diff --git a/static/images/Misc_Marker_32.png b/static/images/Misc_Marker_32.png
deleted file mode 100644
index 705fe3ad5..000000000
Binary files a/static/images/Misc_Marker_32.png and /dev/null differ
diff --git a/static/images/Misc_OtherRenderer.png b/static/images/Misc_OtherRenderer.png
deleted file mode 100644
index b93ae259e..000000000
Binary files a/static/images/Misc_OtherRenderer.png and /dev/null differ
diff --git a/static/images/Misc_OtherRenderer.svg b/static/images/Misc_OtherRenderer.svg
new file mode 100644
index 000000000..602854305
--- /dev/null
+++ b/static/images/Misc_OtherRenderer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><linearGradient id="a" x1="-64" x2="64" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset=".581" stop-color="#a9a9a9"/><stop offset="1" stop-color="#181818"/></linearGradient><path d="M4 24v3l56 1v-4zM32 8 4 28l28 20 28-20z" style="fill:url(#a)" transform="matrix(1.1184 0 0 1.0438 -4.105 5.895)"/><linearGradient id="b" x1="-64" x2="64" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset=".553" stop-color="#fff"/><stop offset="1" stop-color="#979797"/></linearGradient><path d="M32 4 4 24l28 20 28-20z" style="fill:url(#b)" transform="matrix(1.1184 0 0 1.0438 -4.105 4.851)"/><path d="M45 57c4 0 9 0 10-2s9-19 9-23-2-6-2-6l-2 2s2 2 1.01 3.94C59.27 35.44 56 42 54 43s-6 1-6 1zM15 29c10 0 15.99-8 17-9 2-2 1-4 1-4l2-1s1 3-1 7c-.75 1.47-13 20-19 18z" style="fill:#010101;fill-opacity:.4196" transform="translate(7.727 5.55)scale(.6888)"/><path d="M2 16S26 2.87 30 6.87 34 14 34 14l-1 1-5-6-10 4v5L2 28z" style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round" transform="translate(7.727 5.55)scale(.6888)"/><linearGradient id="c" x1="18.37" x2="42.89" y1="-30.82" y2="-22.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#919292"/><stop offset="1" stop-color="#d5d5d5"/></linearGradient><path d="M2 16S26 2.87 30 6.87 34 14 34 14l-1 1-5-6-10 4v5L2 28z" style="fill:url(#c)" transform="translate(7.727 5.55)scale(.6888)"/><path d="M46 36s8-14 12-16 4 9 4 9l-1 2-3-5-5 8-1 12-7 9-19-9s-1-8-4-10-4 6-4 6L2 34V17z" style="fill:none;stroke:#000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round" transform="translate(7.727 5.55)scale(.6888)"/><linearGradient id="d" x1="40" x2="52" y1="-23" y2="-23" gradientUnits="userSpaceOnUse"><stop offset=".369" stop-color="#f8f8f8"/><stop offset=".518" stop-color="#c7c7c7"/></linearGradient><path d="M46 36s8-14 12-16 4 9 4 9l-1 2-3-5-5 8-1 12-7 9-19-9s-1-8-4-10-4 6-4 6L2 34V17zm-17-2c-1 1-1 7 0 8l12 6c1-1 1-8 0-9zM6 23c-1 1-1 7 0 8l10 5c1-1 1-7 0-8z" style="fill:url(#d)" transform="translate(7.727 5.55)scale(.6888)"/><path d="M6 23c-1 1-1 7 0 8l10 5c1-1 1-7 0-8zm23 11c-1 1-1 7 0 8l12 6c1-1 1-8 0-9z" style="fill:#000" transform="translate(7.727 5.55)scale(.6888)"/><linearGradient id="e" x1="19.13" x2="31.86" y1=".81" y2="9.56" gradientUnits="userSpaceOnUse"><stop offset=".051" stop-color="#97bbff"/><stop offset=".482" stop-color="#4168db" stop-opacity=".914"/><stop offset="1" stop-color="#4168db" stop-opacity=".592"/></linearGradient><path d="M6 23c-1 1-1 7 0 8l10 5c1-1 1-7 0-8z" style="fill:url(#e)" transform="translate(7.727 5.55)scale(.6888)"/><linearGradient id="f" x1="79.6" x2="95.97" y1="-48.49" y2="-37.23" gradientUnits="userSpaceOnUse"><stop offset=".051" stop-color="#f56a7d" stop-opacity=".624"/><stop offset=".882" stop-color="#ea064c" stop-opacity=".78"/></linearGradient><path d="M29 34c-1 1-1 7 0 8l12 6c1-1 1-8 0-9z" style="fill:url(#f)" transform="translate(7.727 5.55)scale(.6888)"/></svg>
\ No newline at end of file
diff --git a/static/images/Prefs_Devices.png b/static/images/Prefs_Devices.png
deleted file mode 100644
index 71dea0e1c..000000000
Binary files a/static/images/Prefs_Devices.png and /dev/null differ
diff --git a/static/images/Prefs_Devices.svg b/static/images/Prefs_Devices.svg
new file mode 100644
index 000000000..95aecfda4
--- /dev/null
+++ b/static/images/Prefs_Devices.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M38 60h6l-4-2 24-24v-5h-2l-3 2-4 3-11-4 1-2-23-11L4 36l34 17z" style="fill:#010000;fill-opacity:.4196"/><path d="m4 32 36 18 16-16-6.07-2.87L48 33l-10-5 2.21-1.44L22 18z" style="fill:none;stroke:#010101;stroke-width:4;stroke-linecap:square"/><linearGradient id="a" x1="41.93" x2="57.8" y1="7.25" y2="35.03" gradientUnits="userSpaceOnUse"><stop offset=".004" stop-color="#a3d444"/><stop offset="1" stop-color="#70a804"/></linearGradient><path d="m4 32 36 18 16-16-6.07-2.87L48 33l-10-5 2.21-1.44L22 18z" style="fill:url(#a)"/><linearGradient id="b" x1="48.17" x2="58.29" y1="5.64" y2="35.99" gradientUnits="userSpaceOnUse"><stop offset=".004" stop-color="#fff2ac"/><stop offset="1" stop-color="#ffd805"/></linearGradient><path d="M23 20 9 32l14 7 3-2 15 8M26 21l-7 6 11 7-1 1 14 8M29 23 18 33l4 2 10-10m4 2-3 3 2 4-3 4 3 2 5-6 8 4" style="fill:none;stroke:url(#b);stroke-width:2"/><linearGradient id="c" x1="35.74" x2="37.78" y1="21.92" y2="31.28" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#717171"/><stop offset="1" stop-color="#010101"/></linearGradient><path d="m23 26 8 4-5 5-8-4z" style="fill:url(#c)"/><linearGradient id="d" x1="35.74" x2="37.78" y1="21.92" y2="31.28" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#717171"/><stop offset="1" stop-color="#010101"/></linearGradient><path d="m23 26 8 4-5 5-8-4z" style="fill:url(#d)" transform="translate(13.778 12.778)scale(.7777)"/><path d="m34 56 4 2v-2s-1.6-1.4-2-2l22-22c0-1 2-4 2-4v-2s-2 1-2 0L34 48z" style="fill:none;stroke:#010101;stroke-width:4;stroke-linecap:square"/><linearGradient id="e" x1="15.86" x2="45.6" y1="64.94" y2="17.74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0c0c0c"/><stop offset=".369" stop-color="#797979"/><stop offset=".647" stop-color="#c6c6c6"/><stop offset=".788" stop-color="#a2a2a2"/><stop offset="1" stop-color="#e8e8e8"/></linearGradient><path d="m34 56 24-24c0-1 3-5 3-5v-2s-3 2-3 1L34 48z" style="fill:url(#e)"/><path d="m34 48 4 2v2s-2-1-2 1 2 3 2 3-1-1-1-2 3-4 3-4v-2l-6-2z" style="fill:#010101"/><linearGradient id="f" x1="44.73" x2="50.41" y1="40.53" y2="50.57" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d3d3d3"/><stop offset="1" stop-color="#a9a9a9"/></linearGradient><path d="m34 48 4 2v2s-2-1-2 1 2 3 2 3v2l-4-2z" style="fill:url(#f)"/><path d="m45 44 3-3v-4l-3 3z" style="fill:#010101"/></svg>
\ No newline at end of file
diff --git a/static/images/Prefs_Network.svg b/static/images/Prefs_Network.svg
new file mode 100644
index 000000000..eab082bae
--- /dev/null
+++ b/static/images/Prefs_Network.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M44 64h5l15-16-4-2zM19 20c-7.19 0-13 2.23-13 5 0 2.75 5.81 5 13 5 7.17 0 13-2.25 13-5 0-2.77-5.83-5-13-5" style="fill:#010101;fill-opacity:.4313"/><path d="M32 42s-14 0-14-4c0-8 16-10 16-16 0-4-11-4-11-4" style="fill:none;stroke:#010101;stroke-opacity:.4313;stroke-width:4" transform="matrix(1 0 0 .9285 2 3.143)"/><path d="M32 42s-14 0-14-4c0-8 16-10 16-16 0-4-11-4-11-4m26 4 9 3v23L44 62l-10-6V32zM14 2C7.37 2 2 7.37 2 14c0 6.61 5.37 12 12 12 6.61 0 12-5.39 12-12 0-6.63-5.39-12-12-12z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="33.69" x2="51.6" y1="1.88" y2="3.67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d7d7d7"/><stop offset="1" stop-color="#b8b8b8"/></linearGradient><path d="M44 36v26l-2.13-1.38v-10L36 48l.02 9.21L34 56V32z" style="fill:url(#a)"/><path d="M37.48 48.66 36 48l.02 9.21 1.29.75z" style="fill:#949494"/><linearGradient id="b" x1="33.69" x2="51.6" y1="1.88" y2="3.67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d2d2d2"/><stop offset="1" stop-color="#858585"/></linearGradient><path d="m40.39 49.96-2.91-1.3-.17 9.3 3.06 1.79z" style="fill:url(#b)"/><path d="M41.87 60.62v-10l-1.48-.66-.02 9.79z" style="fill:#c4c4c4"/><linearGradient id="c" x1="24" x2="64" y1="7.99" y2="7.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f4f4f4"/><stop offset="1" stop-color="#dbdbdb"/></linearGradient><path d="m49 22 9 3-14 11-10-4z" style="fill:url(#c)"/><linearGradient id="d" x1="55.69" x2="74.97" y1="-10.23" y2="-5.41" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5c5c5c"/><stop offset="1" stop-color="#838383"/></linearGradient><path d="m44 36 14-11v23L44 62z" style="fill:url(#d)"/><linearGradient id="e" x1="33.69" x2="51.6" y1="1.88" y2="3.67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d2d2d2"/><stop offset="1" stop-color="#858585"/></linearGradient><path d="M40 38v2l2 .5v-2z" style="fill:none;stroke:url(#e);stroke-width:1"/><path d="M40 38v2l2 .5v-2z" style="fill:#a9ff00"/><radialGradient id="f" cx="0" cy="0" r="64" gradientTransform="matrix(.25 0 0 .25 10 10)" gradientUnits="userSpaceOnUse"><stop offset=".044" stop-color="#9eedff"/><stop offset=".146" stop-color="#67ceff"/><stop offset="1" stop-color="#0473b3"/></radialGradient><path d="M14 2c-3.54 0-6.73 1.52-8.93 3.96C5.07 5.96 8 6 8 8s-4 6-4 6v2s2 0 4 2 0 4 0 4l2.27 3.41c1.17.37 2.42.59 3.73.59 2.99 0 5.72-1.1 7.83-2.93L20 22l2-4s-6-2-6-4 4-6 4-6l-2-2-2.13 2H14l2-2-2-2 3.39-1.52C16.31 2.16 15.17 2 14 2" style="fill:url(#f)"/><radialGradient id="g" cx="0" cy="0" r="64" gradientTransform="matrix(.25 0 0 .25 10 10)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b9ff97"/><stop offset=".746" stop-color="#05d65e"/><stop offset="1" stop-color="#049943"/></radialGradient><path d="M5.07 5.96A11.97 11.97 0 0 0 2 14c0 5.32 3.47 9.84 8.27 11.41L8 22s2-2 0-4-4-2-4-2v-2s4-4 4-6-2.93-2.04-2.93-2.04M14 8h2.37L18 6l2 2s-4 4-4 6 6 4 6 4l-2 4 1.83 1.07C24.38 20.88 26 17.62 26 14c0-5.46-3.64-10.05-8.61-11.52L14 4l2 2z" style="fill:url(#g)"/></svg>
\ No newline at end of file
diff --git a/static/images/Prefs_Network_32.png b/static/images/Prefs_Network_32.png
deleted file mode 100644
index d1461e7d4..000000000
Binary files a/static/images/Prefs_Network_32.png and /dev/null differ
diff --git a/static/images/Prefs_VirtualMemory.png b/static/images/Prefs_VirtualMemory.png
deleted file mode 100644
index 42baede6a..000000000
Binary files a/static/images/Prefs_VirtualMemory.png and /dev/null differ
diff --git a/static/images/Prefs_VirtualMemory.svg b/static/images/Prefs_VirtualMemory.svg
new file mode 100644
index 000000000..d950cca67
--- /dev/null
+++ b/static/images/Prefs_VirtualMemory.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M28 56h4l2 2h6l2-2-4-2-1-15z" style="fill:#010000;fill-opacity:.4156" transform="matrix(.9473 0 0 1 24.21 -20)"/><path d="M28 56h4l2 2h6l2-2-4-2-1-15z" style="fill:#010000;fill-opacity:.4156" transform="matrix(.9473 0 0 1 16.631 -14)"/><path d="M28 56h4l2 2h6l2-2-4-2-1-15z" style="fill:#010000;fill-opacity:.4156" transform="matrix(.9473 0 0 1 9.053 -6)"/><path d="M28 56h4l2 2h6l2-2-4-2-1-15z" style="fill:#010000;fill-opacity:.4156" transform="matrix(.9473 0 0 1 1.474 0)"/><path d="M34 10 2 35l26 11 30-28-9-3c-1 1-4 1-6 0s-3-2-2-3zM2 41l26 13v-8L2 35zm26 13 30-30v-6L28 46z" style="fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"/><path d="m28 54 30-30v-6L28 46z" style="fill:#333"/><linearGradient id="a" x1="19.72" x2="38.64" y1="22.9" y2="38.79" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#747474"/><stop offset="1" stop-color="#3e3d3d"/></linearGradient><path d="m2 41 26 13v-8L2 35z" style="fill:url(#a)"/><linearGradient id="b" x1="9.31" x2="45.35" y1="3.47" y2="4.63" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#838383"/></linearGradient><path d="M34 10 2 35l26 11 30-28-9-3c-1 1-4 1-6 0s-3-2-2-3z" style="fill:url(#b)"/><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round" transform="matrix(.9444 0 0 .9023 24.224 -15.505)"/><linearGradient id="c" x1="44.86" x2="50.72" y1="32.73" y2="38.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5a5a5a"/><stop offset=".223" stop-color="#dcdcdc"/><stop offset="1" stop-color="#7e7e7e"/></linearGradient><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:url(#c)" transform="matrix(.9444 0 0 .9023 24.224 -15.505)"/><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round" transform="matrix(.9444 0 0 .9023 16.668 -8.287)"/><linearGradient id="d" x1="44.86" x2="50.72" y1="32.73" y2="38.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5a5a5a"/><stop offset=".223" stop-color="#dcdcdc"/><stop offset="1" stop-color="#7e7e7e"/></linearGradient><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:url(#d)" transform="matrix(.9444 0 0 .9023 16.668 -8.287)"/><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round" transform="matrix(.9444 0 0 .9023 9.113 -1.068)"/><linearGradient id="e" x1="44.86" x2="50.72" y1="32.73" y2="38.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5a5a5a"/><stop offset=".223" stop-color="#dcdcdc"/><stop offset="1" stop-color="#7e7e7e"/></linearGradient><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:url(#e)" transform="matrix(.9444 0 0 .9023 9.113 -1.068)"/><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round" transform="matrix(.9444 0 0 .9023 1.558 6.15)"/><linearGradient id="f" x1="44.86" x2="50.72" y1="32.73" y2="38.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5a5a5a"/><stop offset=".223" stop-color="#dcdcdc"/><stop offset="1" stop-color="#7e7e7e"/></linearGradient><path d="m34 44-4 4 2 1c1 .5 2 1.85 2 2.99 0 2.37.99 5.01.99 5.01L37 54.99s1-4.63 1-7c0-1.14-1-2.49-2-2.99z" style="fill:url(#f)" transform="matrix(.9444 0 0 .9023 1.558 6.15)"/></svg>
\ No newline at end of file
diff --git a/static/images/Server_Syslog.svg b/static/images/Server_Syslog.svg
new file mode 100644
index 000000000..0051b6a6e
--- /dev/null
+++ b/static/images/Server_Syslog.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M62 56c-6 6-16 4-16 4l-8-4s-4 0-4 4L24 48l22-3s25 1 16 11" style="fill:#010101;fill-opacity:.4509"/><path d="M44 58c2 1 4 0 6-2 4-4 8-13 8-19q0-4.5-3-6L20 17c-2-1-3-1-6 1-4 3-8 11-8 17 0 3 1 6 3 7z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="-20.14" x2="-8.39" y1="28.87" y2="2.28" gradientUnits="userSpaceOnUse"><stop offset=".007" stop-color="#663602"/><stop offset=".42" stop-color="#7a5631"/><stop offset="1" stop-color="#bda080"/></linearGradient><path d="M39.26 24.7C29.96 20.98 20 17 20 17c-2-1-3-1-6 1-4 3-8 11-8 17 0 3 1 6 3 7 0 0 10.85 4.96 20.47 9.36C24 47 24.36 38.46 27 33c2.19-4.56 7-7 12.26-8.3" style="fill:url(#a)"/><path d="M50 26 22 10l-8 16 29 15z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="b" cx="0" cy="0" r="64" gradientTransform="matrix(-.3401 .237 -.1558 -.2235 34.305 27.423)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a6a6a6"/><stop offset=".5" stop-color="#fff"/><stop offset=".994" stop-color="#939393"/></radialGradient><path d="M49.81 25.98 22 10l-8 16 2 1 2-1v2l2-1v2l2-1v2l2-1v2l2-1v2l2-1v2l15 7z" style="fill:url(#b)"/><path d="M44 58c2 1 13-26 11-27 0 0-5.97-2.39-12.98-5.2-4.66-1.86-10.28 2.39-12.97 8.4-3.05 6.8-.7 16.81 4.42 19.16C41.13 56.86 44 58 44 58z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="c" x1="-20.14" x2="-8.39" y1="28.87" y2="2.28" gradientUnits="userSpaceOnUse"><stop offset=".007" stop-color="#663602"/><stop offset=".42" stop-color="#7a5631"/><stop offset="1" stop-color="#bda080"/></linearGradient><path d="M44 58c2 1 13-26 11-27 0 0-5.97-2.39-12.98-5.2-4.66-1.86-12.8 2.63-15.97 8.4-3.63 6.58-1.7 14.81 3.42 17.16z" style="fill:url(#c)"/><path d="M42 52c0 7 4 8 8 4s8-13 8-19-4-8-8-4-8 12-8 19z" style="fill:none;stroke:#462501;stroke-width:4" transform="matrix(.9 0 0 .8727 4 5.424)"/><radialGradient id="d" cx="0" cy="0" r="64" gradientTransform="matrix(.0898 .0367 -.0841 .2057 50.08 45.209)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e3c9a3"/><stop offset=".151" stop-color="#ae7625"/><stop offset=".299" stop-color="#e3c9a3"/><stop offset=".473" stop-color="#ae7625"/><stop offset=".663" stop-color="#e3c9a3"/><stop offset=".833" stop-color="#ae7625"/><stop offset=".996" stop-color="#e3c9a3"/></radialGradient><path d="M42 52c0 7 4 8 8 4s8-13 8-19-4-8-8-4-8 12-8 19" style="fill:url(#d)"/><linearGradient id="e" x1="-19.7" x2="-8.39" y1="27.87" y2="2.28" gradientUnits="userSpaceOnUse"><stop offset=".462" stop-color="#6a4217"/><stop offset="1" stop-color="#997b5b"/></linearGradient><path d="M26 34s6 10 8 10c1.06 0 2.53-4.72 5-8 3-4 5-4.06 5-5 0-2-5-6-5-6s-8-1-13 9" style="fill:url(#e)"/><path d="M15 8c4 2-4 15-4 17s2 2 2 2l9-18s1-2-1-3l-6-3c-2-1-3 1-3 1L4 20c-1 2 1 3 1 3s2 1 3-1v-3l2-1v-3l2-1v-3l2-1z" style="fill:none;stroke:#000;stroke-width:4" transform="translate(-2 -1)"/><path d="M15 8c4 2-4 15-4 17s2 2 2 2l9-18s1-2-1-3l-6-3c-2-1-3 1-3 1L4 20c-1 2 1 3 1 3s2 1 3-1v-3l2-1v-3l2-1v-3l2-1z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="f" x1="-15.01" x2="-8.02" y1="18.06" y2="5.04" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c70505"/><stop offset=".996" stop-color="#ff6e6e"/></linearGradient><path d="M13 2c-2-1-3 1-3 1L2 19c-1 2 1 3 1 3l2 1s-2-1-1-3l8-16s1-2 3-1z" style="fill:url(#f)"/><path d="M13.28 7.14c4 2-4 15-4 17 0 .92.43 1.4.88 1.67l1.71.86c-.45-.27-.87-.76-.87-1.67 0-2 8-15 4-17z" style="fill:#6e0101"/><linearGradient id="g" x1="12.56" x2="27.05" y1="32.68" y2="29.91" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b50404"/><stop offset=".996" stop-color="#e50606"/></linearGradient><path d="M15 8c4 2-4 15-4 17s2 2 2 2l9-18s1-2-1-3l-6-3c-2-1-3 1-3 1L4 20c-1 2 1 3 1 3s2 1 3-1v-3l2-1v-3l2-1v-3l2-1z" style="fill:url(#g)"/><path d="M26 44c2 6 6 10 6 10s-2 2 0 4-6-2-8 0-4-2-8-4c6-2 4-4 4-4 4 0 6-6 6-6z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="h" cx="0" cy="0" r="64" gradientTransform="matrix(.1875 0 0 .125 22 51)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e3c9a3"/><stop offset="1" stop-color="#ae7625"/></radialGradient><path d="M26 44c2 6 6 10 6 10s-2 2 0 4-6-2-8 0-4-2-8-4c6-2 4-4 4-4 4 0 6-6 6-6" style="fill:url(#h)"/></svg>
\ No newline at end of file
diff --git a/static/images/Server_Syslog_32.png b/static/images/Server_Syslog_32.png
deleted file mode 100644
index ce5343a2d..000000000
Binary files a/static/images/Server_Syslog_32.png and /dev/null differ
diff --git a/static/images/System_Kernel.svg b/static/images/System_Kernel.svg
new file mode 100644
index 000000000..265501078
--- /dev/null
+++ b/static/images/System_Kernel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10" style="fill:#010101;fill-opacity:.4" transform="matrix(1 0 0 .5 10.375 32.125)"/><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10" style="fill:#010101;fill-opacity:.4" transform="matrix(.5 0 0 .25 -.625 40.625)"/><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10" style="fill:#010101;fill-opacity:.4" transform="matrix(.4 0 0 .25 45.575 45.625)"/><linearGradient id="a" x1="64.37" x2="14.99" y1="118.55" y2="99.6" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#000;stop-opacity:0"/><stop offset="1" stop-opacity="0" style="stop-color:#000;stop-opacity:1"/></linearGradient><path d="M21 45c12 12 28 16 36 8s4-24-8-36S21 1 13 9s-4 24 8 36z" style="fill:none;stroke:url(#a);stroke-width:2"/><linearGradient id="b" x1=".95" x2="56.82" y1="-59.53" y2="-45.05" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#000;stop-opacity:0"/><stop offset="1" stop-opacity="0" style="stop-color:#000;stop-opacity:1"/></linearGradient><path d="M9 57c8 8 24 4 36-8s16-28 8-36c-7-7-24-4-36 8S1 49 9 57z" style="fill:none;stroke:url(#b);stroke-width:2"/><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="c" cx="0" cy="0" r="64" gradientTransform="translate(29 29)scale(.2222)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".254" stop-color="#dc4747"/><stop offset=".769" stop-color="#890b0b"/><stop offset="1" stop-color="#a01e1e"/></radialGradient><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10" style="fill:url(#c)"/><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10z" style="fill:none;stroke:#000;stroke-width:7" transform="translate(-5.167 11.833)scale(.4583)"/><radialGradient id="d" cx="0" cy="0" r="64" gradientTransform="matrix(.1428 0 0 .1746 29 29)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffecc7"/><stop offset="1" stop-color="#ffa800"/></radialGradient><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10" style="fill:url(#d)" transform="translate(-5.167 11.833)scale(.4583)"/><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10z" style="fill:none;stroke:#000;stroke-width:10" transform="translate(42.5 25.5)scale(.375)"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.1428 0 0 .1746 29 29)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffecc7"/><stop offset="1" stop-color="#ffa800"/></radialGradient><path d="M32 22c-6 0-10 4-10 10s4 10 10 10 10-4 10-10-4-10-10-10" style="fill:url(#e)" transform="translate(42.5 25.5)scale(.375)"/></svg>
\ No newline at end of file
diff --git a/static/images/System_Kernel_32.png b/static/images/System_Kernel_32.png
deleted file mode 100644
index 5edf26e71..000000000
Binary files a/static/images/System_Kernel_32.png and /dev/null differ
diff --git a/static/images/Website_Edit_Profile.svg b/static/images/Website_Edit_Profile.svg
new file mode 100644
index 000000000..e6af31050
--- /dev/null
+++ b/static/images/Website_Edit_Profile.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><path d="M26 63h10c5 0 10.2-3.04 14.75-2.88 10.37.38 13.5-3.75 7.12-5.75C54.04 53.17 50 55 46 53c-2-1-12-1-12-1v4z" style="fill:#010101;fill-opacity:.4117"/><path d="M14 16v19l2 2v20l4 2h2v1l4 2 6-6V39l2-2V18l-13-6z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="a" x1="73.74" x2="116.61" y1="-57.07" y2="-8.05" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffdb97"/><stop offset="1" stop-color="#fcaf29"/></linearGradient><path d="M14 16v18l2 3v20l4 2h2v1l4 2V42h2V22z" style="fill:url(#a)"/><linearGradient id="b" x1="-43.97" x2="-24.83" y1="-38.98" y2="-56.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff7ea"/><stop offset=".996" stop-color="#fdd17b"/></linearGradient><path d="m14 16 14 6 6-4-12-2 3.99-2.01L21 12z" style="fill:url(#b)"/><linearGradient id="c" x1="54.23" x2="75.84" y1="-52.61" y2="-45.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85805"/><stop offset="1" stop-color="#f06306"/></linearGradient><path d="M28 42h-2v20l6-6V39l2-2V18l-6 4z" style="fill:url(#c)"/><path d="M26 42v6l6-9-4 3z" style="fill:#a32904"/><linearGradient id="d" x1="25.92" x2="36.07" y1="-64" y2="-64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85804"/><stop offset="1" stop-color="#dc952f"/></linearGradient><path d="m22 16 12 2-8-4z" style="fill:url(#d)"/><path d="M24 2c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="e" cx="0" cy="0" r="64" gradientTransform="matrix(.1736 0 0 .1696 22.625 6.375)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f2f2f2"/><stop offset=".674" stop-color="#7d7a7a"/><stop offset="1" stop-color="#bca184"/></radialGradient><path d="M24 2c-3 0-6 3-6 6s3 6 6 6 6-3 6-6-3-6-6-6" style="fill:url(#e)"/><linearGradient id="f" x1="54.23" x2="75.84" y1="-52.61" y2="-45.97" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c85805"/><stop offset="1" stop-color="#f06306"/></linearGradient><path d="M20 59h2V42l-2-1z" style="fill:url(#f)"/><path d="M12 34v6l4 2 4-2v-6l4 4v6l-4 3v13s0 2-4 2-4-2-4-2V47l-4-3v-6z" style="fill:none;stroke:#010000;stroke-width:4;stroke-linejoin:round" transform="translate(32 -28)"/><linearGradient id="g" x1="64.85" x2="80.64" y1="-37.99" y2="-27.31" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ebebeb"/><stop offset="1" stop-color="#adadad"/></linearGradient><path d="M12 34v6l4 2 4-2v-6l4 4v6l-4 3v13s0 2-4 2-4-2-4-2V47l-4-3v-6z" style="fill:url(#g)" transform="translate(32 -28)"/></svg>
\ No newline at end of file
diff --git a/static/images/Website_Edit_Profile_32.png b/static/images/Website_Edit_Profile_32.png
deleted file mode 100644
index 7c9e96427..000000000
Binary files a/static/images/Website_Edit_Profile_32.png and /dev/null differ
diff --git a/static/images/Website_Submit_32.png b/static/images/Website_Submit_32.png
deleted file mode 100644
index 9190172fb..000000000
Binary files a/static/images/Website_Submit_32.png and /dev/null differ
diff --git a/static/images/alert_idea_32.png b/static/images/alert_idea_32.png
deleted file mode 100644
index 352122c74..000000000
Binary files a/static/images/alert_idea_32.png and /dev/null differ
diff --git a/static/images/archive_64.png b/static/images/archive_64.png
deleted file mode 100644
index c84c790e4..000000000
Binary files a/static/images/archive_64.png and /dev/null differ
diff --git a/static/images/bug_tracker_32.png b/static/images/bug_tracker_32.png
deleted file mode 100644
index 315212f0a..000000000
Binary files a/static/images/bug_tracker_32.png and /dev/null differ
diff --git a/static/images/download.svg b/static/images/download.svg
new file mode 100644
index 000000000..880d0aefa
--- /dev/null
+++ b/static/images/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="64" height="64" color-interpolation="linearRGB"><g style="color-interpolation:linearRGB" transform="matrix(1.5 0 0 1.5 -16 -16)"><path d="m22 24-8 6 15 16 13-6 7-7-8-2V18l-12-3-7 5z" style="fill:none;stroke:#010000;stroke-width:4"/><linearGradient id="a" x1="13" x2="47" y1="-20" y2="-20" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eeffac"/><stop offset="1" stop-color="#d5e68f"/></linearGradient><path d="m21 25-7 5 8.04 2.87 2-7z" style="fill:url(#a)"/><linearGradient id="b" x1="13" x2="47" y1="-20" y2="-20" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eeffac"/><stop offset="1" stop-color="#d5e68f"/></linearGradient><path d="m42 40 7-7-15 1 .04 3.15z" style="fill:url(#b)"/><path d="m41 37 8-4-8.16-2.34L34 32l.04 5.15z" style="fill:#b4d339"/><linearGradient id="c" x1="46.93" x2="67.71" y1="-1.38" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4c5e02"/><stop offset="1" stop-color="#698303"/></linearGradient><path d="m34 23-2 3v12h2l7-7V18Z" style="fill:url(#c)"/><linearGradient id="d" x1="54.4" x2="72.74" y1="-7.28" y2="22.81" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#97e306"/><stop offset="1" stop-color="#81a104"/></linearGradient><path d="m42 40-13 6-15-16 8.04 2.87L22 20l12 3 .04 14.15z" style="fill:url(#d)"/><linearGradient id="e" x1="13" x2="47" y1="-20" y2="-20" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eeffac"/><stop offset="1" stop-color="#d5e68f"/></linearGradient><path d="m22 20 12 4 7-6-12-3z" style="fill:url(#e)"/></g><g style="display:inline"><path d="M15 36s-4 4-4 11c-2-4-7-5-7-5s-1 6 5 9c0 0 0 1-6 1 0 0 3 6 11 4v4h2v-4c8 2 11-4 11-4-6 0-6-1-6-1 6-3 5-9 5-9s-5 1-7 5c0-7-4-11-4-11z" style="fill:none;stroke:#000;stroke-width:4"/><radialGradient id="f" cx="0" cy="0" r="64" gradientTransform="matrix(.0874 -.379 .4747 .1095 8.15 41.589)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffb11b"/><stop offset="1" stop-color="#fff9c7"/></radialGradient><path d="M15 36s-4 4-4 11c-2-4-7-5-7-5s-1 6 5 9c0 0 0 1-6 1 0 0 3 6 11 4v4h2v-4c8 2 11-4 11-4-6 0-6-1-6-1 6-3 5-9 5-9s-5 1-7 5c0-7-4-11-4-11" style="fill:url(#f)"/></g></svg>
\ No newline at end of file
diff --git a/static/images/download_32.png b/static/images/download_32.png
deleted file mode 100644
index 0368782bc..000000000
Binary files a/static/images/download_32.png and /dev/null differ
diff --git a/static/images/folder_config_32.png b/static/images/folder_config_32.png
deleted file mode 100644
index 47946fba3..000000000
Binary files a/static/images/folder_config_32.png and /dev/null differ
diff --git a/static/images/folder_haiku_48.png b/static/images/folder_haiku_48.png
deleted file mode 100644
index 625d8c8a0..000000000
Binary files a/static/images/folder_haiku_48.png and /dev/null differ
diff --git a/static/images/generic-file_32.png b/static/images/generic-file_32.png
deleted file mode 100644
index edd051767..000000000
Binary files a/static/images/generic-file_32.png and /dev/null differ
diff --git a/static/images/harddisk_32.png b/static/images/harddisk_32.png
deleted file mode 100644
index d6ffed050..000000000
Binary files a/static/images/harddisk_32.png and /dev/null differ
diff --git a/static/images/ide_project_32.png b/static/images/ide_project_32.png
deleted file mode 100644
index b9f4621c3..000000000
Binary files a/static/images/ide_project_32.png and /dev/null differ
diff --git a/static/images/installer_32.png b/static/images/installer_32.png
deleted file mode 100644
index 67be62315..000000000
Binary files a/static/images/installer_32.png and /dev/null differ
diff --git a/static/images/installer_64.png b/static/images/installer_64.png
deleted file mode 100644
index 736bdf585..000000000
Binary files a/static/images/installer_64.png and /dev/null differ
diff --git a/static/images/microphone.svg b/static/images/microphone.svg
new file mode 100644
index 000000000..479ce5019
--- /dev/null
+++ b/static/images/microphone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" color-interpolation="linearRGB"><linearGradient id="a" x1="65.06" x2="71.69" y1="43.9" y2="52.07" gradientUnits="userSpaceOnUse"><stop offset="0"/><stop offset="1" stop-opacity="0"/></linearGradient><path d="M32 50c4 0 2 10 8 10s8-10 12-6l8 8" style="fill:none;stroke:url(#a);stroke-width:4"/><path d="M14 51s-4-2-2-6l4-8 6 3-6 12z" style="fill:none;stroke:#000;stroke-width:4"/><path d="M14 51s-4-2-2-6l4-8 6 3-6 12z" style="fill:#c7d0d8"/><path d="m30 44-6 6c-4 4-8 2-8 2s-4-2-2-6l4-8z" style="fill:#49687b"/><linearGradient id="b" x1="48.28" x2="48.22" y1="48.14" y2="64.06" gradientUnits="userSpaceOnUse"><stop offset="0"/><stop offset=".667"/><stop offset="1" stop-opacity="0"/></linearGradient><path d="M26 47s-4-6-8-4-4 6-4 6v15h12z" style="fill:none;stroke:url(#b);stroke-width:4"/><linearGradient id="c" x1="71.73" x2="71.75" y1="34.41" y2="63.87" gradientUnits="userSpaceOnUse"><stop offset=".261" stop-color="#7f909c"/><stop offset=".477" stop-color="#fff"/><stop offset=".822" stop-color="#c5ccd1"/><stop offset="1" stop-color="#c5ccd1" stop-opacity="0"/></linearGradient><path d="M26 47s-4-6-8-4-4 6-4 6v15h12z" style="fill:url(#c)"/><linearGradient id="d" x1="58.27" x2="58.22" y1="48.24" y2="63.98" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#174861"/><stop offset=".667" stop-color="#7a909c"/><stop offset="1" stop-color="#7a909c" stop-opacity="0"/></linearGradient><path d="M18 51v13h8V47s0-4-4-2-4 6-4 6" style="fill:url(#d)"/><path d="m16 37 14 7-6 12-2-1s-4-2-2-6l2-4-6-3m18 4-4 8c-2 4-6 2-6 2s-4-2-2-6l4-8z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="e" x1="33.64" x2="41.29" y1="27.87" y2="39.62" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c1cbd2"/><stop offset=".462" stop-color="#fff"/><stop offset="1" stop-color="#9dabb6"/></linearGradient><path d="m16 37 14 7-6 12-2-1s-4-2-2-6l2-4-6-3" style="fill:url(#e)"/><radialGradient id="f" cx="0" cy="0" r="64" gradientTransform="matrix(.0901 -.0713 .142 .1793 22.843 51.12)" gradientUnits="userSpaceOnUse"><stop offset=".455" stop-color="#738b98"/><stop offset=".996" stop-color="#204965"/></radialGradient><path d="m34 46-4 8c-2 4-6 2-6 2s-4-2-2-6l4-8z" style="fill:url(#f)"/><path d="M28 53a2 2 0 1 1-4 0c0-1.11.89-2 2-2a2 2 0 0 1 2 2" style="fill:#000"/><path d="M28 2c-4-1-7 0-9 4L9 26q-3 6 3 9l8 4q6 3 9-3l12-24c2-4 0-7-4-8zm20 7c-2-2-5-1-6 1L28 38c-1 2 0 5 2 6l8 4c2 1 5 0 6-2l12-24c1-2 1-5-1-7zm0 0c-2-2-5.9-3.98-11-5L20 39l10 5z" style="fill:none;stroke:#000;stroke-width:4"/><linearGradient id="g" x1="42.2" x2="26.06" y1="7.1" y2="39.77" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d2d2d2"/><stop offset="1" stop-color="#84959d"/></linearGradient><path d="M48 9c-2-2-5.9-3.98-11-5L20 39l10 5z" style="fill:url(#g)"/><radialGradient id="h" cx="0" cy="0" r="64" gradientTransform="matrix(.2295 .0363 -.0836 .5285 46.894 20.298)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8a9eaa"/><stop offset="1" stop-color="#3b607a"/></radialGradient><path d="M48 9c-2-2-5-1-6 1L28 38c-1 2 0 5 2 6l8 4c2 1 5 0 6-2l12-24c1-2 1-5-1-7z" style="fill:url(#h)"/><radialGradient id="i" cx="0" cy="0" r="64" gradientTransform="matrix(.2932 .0465 -.075 .4725 25.77 8.2)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#b0b9c0"/></radialGradient><path d="M28 2c-4-1-7 0-9 4L9 26q-3 6 3 9l8 4q6 3 9-3l12-24c2-4 0-7-4-8z" style="fill:url(#i)"/><path d="M15.58 29.64 12.8 35.4M28.89 2.2l-2.65 5.47m3.48 1.04L32.5 3M19.2 38.59l2.87-5.91m-3.25-1.52L16 37M33.2 9.75l2.89-5.96M38.93 26.62 35 24l-6.52-2.48m-1.63 3.36 6.4 2.62 3.96 2.46m-7.09-11.8 6.63 2.34 3.9 2.78m1.72-3.35L38.5 17l-6.75-2.2M23.14 12 17 10m-1.5 3 6.12 2.15m13.87 18.16L31.5 31l-6.28-2.76m-1.64 3.37 6.17 2.89 4.02 2.16m11.07-1.94L48.5 37m1.5-3-3.57-2.38m1.59-3.09L51.5 31m1.5-3-3.38-2.57m1.59-3.09L54.5 25M33.38 11.44l6.87 2.06 3.84 3.1M18.5 7l6.18 1.84m16.96 32.08L45.5 43m1.5-3-3.76-2.19M9.5 25l5.98 2.8m1.54-3.16L11 22m1.5-3 6.05 2.47m1.53-3.16L14 16" style="fill:none;stroke:#000;stroke-width:2"/></svg>
\ No newline at end of file
diff --git a/static/images/microphone_48.png b/static/images/microphone_48.png
deleted file mode 100644
index f4f6b3aff..000000000
Binary files a/static/images/microphone_48.png and /dev/null differ
diff --git a/static/images/pdf_32.png b/static/images/pdf_32.png
deleted file mode 100644
index 8973b7079..000000000
Binary files a/static/images/pdf_32.png and /dev/null differ
diff --git a/static/images/people_64.png b/static/images/people_64.png
deleted file mode 100644
index 4efa3d069..000000000
Binary files a/static/images/people_64.png and /dev/null differ
diff --git a/static/images/piggy-bank.png b/static/images/piggy-bank.png
deleted file mode 100644
index f09457cb3..000000000
Binary files a/static/images/piggy-bank.png and /dev/null differ
diff --git a/static/images/styled_edit_48.png b/static/images/styled_edit_48.png
deleted file mode 100644
index e4c12fd51..000000000
Binary files a/static/images/styled_edit_48.png and /dev/null differ
diff --git a/static/images/webcam.png b/static/images/webcam.png
deleted file mode 100644
index 0851d1ce1..000000000
Binary files a/static/images/webcam.png and /dev/null differ
diff --git a/themes/shijin4/layouts/conference/section.html b/themes/shijin4/layouts/conference/section.html
index 66dce7ae5..f36c14fc1 100644
--- a/themes/shijin4/layouts/conference/section.html
+++ b/themes/shijin4/layouts/conference/section.html
@@ -8,7 +8,7 @@ <h1 class="title">Upcoming Events</h1>
 				<p>
 				<div class="pull-right text-center" style="background-color: #e4ffde; padding: 5px 10px; margin: 0 0 20px 20px;">
 					<a href="/contact/">
-						<img src="/images/App_People_64.png"><br>
+						<img src="/images/App_People.svg" width="64" height="64" alt=""><br>
 						Add your event here!
 					</a>
 				</div>
diff --git a/themes/shijin4/layouts/partials/fundraising.html b/themes/shijin4/layouts/partials/fundraising.html
index 7b404f865..e6e6a2a31 100644
--- a/themes/shijin4/layouts/partials/fundraising.html
+++ b/themes/shijin4/layouts/partials/fundraising.html
@@ -8,9 +8,7 @@
 	color: #000;
 }
 .fundraising-meter {
-	background-image:url("/images/piggy-bank.png");
-	background-repeat:no-repeat;
-	background-position: center top;
+	background: url(/images/App_Finance.svg) center top / 128px 128px no-repeat;
 	width: 100%;
 }
 .fundraising-progress-bar-borders {
diff --git a/themes/shijin4/layouts/partials/navbar.html b/themes/shijin4/layouts/partials/navbar.html
index 655cf558b..177d5cf1a 100644
--- a/themes/shijin4/layouts/partials/navbar.html
+++ b/themes/shijin4/layouts/partials/navbar.html
@@ -1,10 +1,10 @@
-<a href="/"><img src="/images/haiku_logo_white.svg" alt="Home" id="logo" height="100" style='padding-left: 3px;'></a>
+<a href="/"><img src="/images/haiku_logo_white.svg" alt="Home" id="logo" height="100" style="padding-left: 3px;"></a>
 <div id="top-links">
-	<a href="/get-haiku" title="Get Haiku!" class="toggleopacity"><img src="/images/download_32.png" text="Get Haiku!" alt="Download"></a>
-	<a href="/contact" title="Contact the Haiku Project" class="toggleopacity"><img src="/images/App_Mail_32.png" text="Contact the Haiku Project" alt="Contact"></a>
-	<a href="/community/donating_to_haiku" title="Make a donation to the Haiku Project" class="toggleopacity"><img src="/images/App_Finance_32.png" alt="Donate" text="Make a donation to the Haiku Project"></a>
-	<a href="https://dev.haiku-os.org" title= "Report bugs" class="toggleopacity"><img src="/images/bug_tracker_32.png" alt="Report Bugs" text="Report bugs related to Haiku"></a>
-	<a href="https://depot.haiku-os.org" title="Download apps for Haiku from HaikuDepot" class="toggleopacity"><img src="/images/installer_32.png" alt="HaikuDepot" text="Download apps for Haiku from HaikuDepot"></a>
+	<a href="/get-haiku" title="Get Haiku!" class="toggleopacity"><img src="/images/download.svg" width="32" height="32" text="Get Haiku!" alt="Download"></a>
+	<a href="/contact" title="Contact the Haiku Project" class="toggleopacity"><img src="/images/App_Mail.svg" width="32" height="32" text="Contact the Haiku Project" alt="Contact"></a>
+	<a href="/community/donating_to_haiku" title="Make a donation to the Haiku Project" class="toggleopacity"><img src="/images/App_Finance.svg" width="32" height="32" alt="Donate" text="Make a donation to the Haiku Project"></a>
+	<a href="https://dev.haiku-os.org" title= "Report bugs" class="toggleopacity"><img src="/images/App_Debugger.svg" width="32" height="32" alt="Report Bugs" text="Report bugs related to Haiku"></a>
+	<a href="https://depot.haiku-os.org" title="Download apps for Haiku from HaikuDepot" class="toggleopacity"><img src="/images/App_Installer.svg" width="32" height="32" alt="HaikuDepot" text="Download apps for Haiku from HaikuDepot"></a>
 </div>
 <nav class="navbar navbar-expand-sm navbar-light bg-light">
 	<button class="navbar-toggler collapsed"
diff --git a/themes/shijin4/layouts/partials/sidebar_articles.html b/themes/shijin4/layouts/partials/sidebar_articles.html
index 4e648500e..ea74f1709 100644
--- a/themes/shijin4/layouts/partials/sidebar_articles.html
+++ b/themes/shijin4/layouts/partials/sidebar_articles.html
@@ -1,6 +1,6 @@
 <div class="card">
 	<a href="/articles/" style="margin-left: 0"><div class="card-heading">
-		<div class="block-icon" style="background: transparent url(/images/File_Text_48.png) no-repeat scroll left center;"></div>
+		<div class="block-icon" style="background: transparent url(/images/File_Text.svg) left center / 48px 48px no-repeat;"></div>
 		<h4 class="title">Latest Articles</h4>
 	</div></a>
 	<ul>
diff --git a/themes/shijin4/layouts/partials/sidebar_blogosphere.html b/themes/shijin4/layouts/partials/sidebar_blogosphere.html
index dd5471993..0d0a36a48 100644
--- a/themes/shijin4/layouts/partials/sidebar_blogosphere.html
+++ b/themes/shijin4/layouts/partials/sidebar_blogosphere.html
@@ -1,7 +1,7 @@
 <div class="card">
 	<a href="/blog/" style="margin-left: 0">
 	<div class="card-heading">
-		<div class="block-icon" style="background: transparent url(/images/styled_edit_48.png) no-repeat scroll left center;"></div>
+		<div class="block-icon" style="background: transparent url(/images/App_StyledEdit.svg) left center / 48px 48px no-repeat;"></div>
 		<h4 class="title">Blog-O-Sphere</h4>
 	</div>
 	</a>
diff --git a/themes/shijin4/layouts/partials/sidebar_events.html b/themes/shijin4/layouts/partials/sidebar_events.html
index ed26dc3df..addb3e776 100644
--- a/themes/shijin4/layouts/partials/sidebar_events.html
+++ b/themes/shijin4/layouts/partials/sidebar_events.html
@@ -10,7 +10,7 @@
 {{ if ge ($.Scratch.Get "haveCurrentEvents") 1 }}
 <div class="card">
 	<a href="/conferences/" style="margin-left: 0"><div class="card-heading">
-		<div class="block-icon" style="background: transparent url(/images/File_Text_48.png) no-repeat scroll left center;"></div>
+		<div class="block-icon" style="background: transparent url(/images/File_Text.svg) left center / 48px 48px no-repeat;"></div>
 		<h4 class="title">Events</h4>
 	</div></a>
 	<ul>
diff --git a/themes/shijin4/layouts/partials/sidebar_menu.html b/themes/shijin4/layouts/partials/sidebar_menu.html
index 240ca2672..b06c209c8 100644
--- a/themes/shijin4/layouts/partials/sidebar_menu.html
+++ b/themes/shijin4/layouts/partials/sidebar_menu.html
@@ -1,6 +1,6 @@
 <div class="card">
 	<div class="card-heading">
-		<div class="block-icon" style="background: transparent url(/images/folder_haiku_48.png) no-repeat scroll left center;"></div>
+		<div class="block-icon" style="background: transparent url(/images/Folder_haiku.svg) left center / 48px 48px no-repeat;"></div>
 		<h4 class="title">Menu</h4>
 	</div>
 	<ul>
diff --git a/themes/shijin4/layouts/partials/sidebar_news.html b/themes/shijin4/layouts/partials/sidebar_news.html
index 442cf6447..8f34421e5 100644
--- a/themes/shijin4/layouts/partials/sidebar_news.html
+++ b/themes/shijin4/layouts/partials/sidebar_news.html
@@ -1,6 +1,6 @@
 <div class="card">
 	<a href="/news/" style="margin-left: 0"><div class="card-heading">
-		<div class="block-icon" style="background: transparent url(/images/microphone_48.png) no-repeat scroll left center;"></div>
+		<div class="block-icon" style="background: transparent url(/images/microphone.svg) left center / 48px 48px no-repeat;"></div>
 		<h4 class="title">News</h4>
 	</div></a>
 	<ul>
diff --git a/themes/shijin4/static/css/shijin4.css b/themes/shijin4/static/css/shijin4.css
index 4e4e9f31e..990327e2a 100644
--- a/themes/shijin4/static/css/shijin4.css
+++ b/themes/shijin4/static/css/shijin4.css
@@ -176,14 +176,14 @@ nav.navbar button.btn:hover {
 	line-height: 1.7em;
 }
 .preface-install-links {
-	background: url(/images/installer_64.png) no-repeat;
+	background: url(/images/App_Installer.svg) 0 0 / 64px 64px no-repeat;
 	padding-left: 70px;
 	padding-top: 0px;
 	min-height: 80px;
 	margin-top: 20px;
 }
 .preface-community-links {
-	background: url(/images/people_64.png) no-repeat;
+	background: url(/images/App_People.svg) 0 0 / 64px 64px no-repeat;
 	padding-left: 70px;
 	padding-top: 0px;
 	min-height: 80px;
@@ -475,19 +475,19 @@ div.alert {
 }
 
 div.alert-danger {
-	background: #f2dede url(/images/Alert_Stop_32.png) 15px 15px no-repeat;
+	background: #f2dede url(/images/Alert_Stop.svg) 15px 15px / 32px 32px no-repeat;
 	padding-left: 60px;
 }
 div.alert-warning {
-	background: #fcf8e3 url(/images/Alert_Warning_32.png) 15px 15px no-repeat;
+	background: #fcf8e3 url(/images/Alert_Warning.svg) 15px 15px / 32px 32px no-repeat;
 	padding-left: 60px;
 }
 div.alert-info {
-	background: #d9edf7 url(/images/Alert_Info_32.png) 15px 15px no-repeat;
+	background: #d9edf7 url(/images/Alert_Info.svg) 15px 15px / 32px 32px no-repeat;
 	padding-left: 60px;
 }
 div.alert-donate {
-	background: #ffd6d6 url(/images/App_Finance_32.png) 15px 15px no-repeat;
+	background: #ffd6d6 url(/images/App_Finance.svg) 15px 15px / 32px 32px no-repeat;
 	padding-left: 60px;
 	border-color: #652626;
 }
@@ -752,23 +752,19 @@ footer a, footer span.glyphicon {
 		color: #CCC;
 	}
 	div.alert-danger {
-		background: #4d0000 url(/images/Alert_Stop_32.png) 15px 15px no-repeat;
-		padding-left: 60px;
+		background-color: #4d0000;
 		color: #eee;
 	}
 	div.alert-warning {
-		background: #453b07 url(/images/Alert_Warning_32.png) 15px 15px no-repeat;
-		padding-left: 60px;
+		background-color: #453b07;
 		color: #eee;
 	}
 	div.alert-info {
-		background: #0d2f3f url(/images/Alert_Info_32.png) 15px 15px no-repeat;
-		padding-left: 60px;
+		background-color: #0d2f3f;
 		color: #eee;
 	}
 	div.alert-donate {
-		background: #652626 url(/images/App_Finance_32.png) 15px 15px no-repeat;
-		padding-left: 60px;
+		background-color: #652626;
 		color: #eee;
 		border-color: #ffd6d6;
 	}