feat(JSON): test QJsonModel

feat(QJsonModel): compile and first model test
feat(qtquick): chat example to build up on
2024-08-11 20:54:39 +02:00 · 2024-08-04 04:50:11 +02:00 · 2024-07-30 10:56:05 +02:00
76 changed files with 285 additions and 46279 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "external/QJsonModel"]
+	path = external/QJsonModel
+	url = https://github.com/dridk/QJsonModel.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,87 +1,39 @@
 cmake_minimum_required(VERSION 3.28)
-project(itat_challenge_olympics)
+project(itat_challange_olympics)

-find_package(Qt6 6.2 COMPONENTS Core Quick Quick REQUIRED)
-
-qt_standard_project_setup(REQUIRES 6.5)
 set(CMAKE_CXX_STANDARD 17)
+
+find_package(Qt6 COMPONENTS
+	Core REQUIRED
+	Gui REQUIRED
+	Widgets REQUIRED
+  Network REQUIRED
+  Quick REQUIRED
+)
+
+# SET(MODULES_EXTERNAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
+
+# include_directories(BEFORE ${MODULES_EXTERNAL_DIR})
+
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
-qt_add_executable(itat_challenge_olympics src/main/main.cpp
-        application.qrc
-    )
+qt_add_executable(itat_challange_olympics application.qrc main.cpp
+  external/QJsonModel/include/QJsonModel.hpp
+  external/QJsonModel/QJsonModel.cpp)

+target_include_directories(itat_challange_olympics PRIVATE
+  external/QJsonModel/include)

-qt_add_qml_module(itat_challenge_olympics
-    URI itat
-    QML_FILES
-        res/gui/application.qml
-        res/gui/EventInfoPage.qml
-        res/gui/EventsPage.qml
+# add_subdirectory(${MODULES_EXTERNAL_DIR}/QJsonModel)
+# target_link_libraries(itat_challange_olympics PRIVATE Qt6::QJsonModelStatic)
+# target_include_directories(itat_challange_olympics PRIVATE ${CMAKE_BINARY_DIR}/include)

-    SOURCES
-        src/model/Competitor.cpp
-        src/model/Competitor.h
-        src/model/EventInfo.cpp
-        src/model/EventInfo.h
-        src/model/FilterModel.cpp
-        src/model/FilterModel.h
-        src/model/SportModel.cpp
-        src/model/SportModel.h
-
-    RESOURCES
-        res/pictograms/ARC_small.svg
-        res/pictograms/ATH_small.svg
-        res/pictograms/BDM_small.svg
-        res/pictograms/BK3_small.svg
-        res/pictograms/BKB_small.svg
-        res/pictograms/BKG_small.svg
-        res/pictograms/BMF_small.svg
-        res/pictograms/BMX_small.svg
-        res/pictograms/BOX_small.svg
-        res/pictograms/CER_small.svg
-        res/pictograms/CLB_small.svg
-        res/pictograms/CRD_small.svg
-        res/pictograms/CSL_small.svg
-        res/pictograms/CSP_small.svg
-        res/pictograms/CTR_small.svg
-        res/pictograms/DIV_small.svg
-        res/pictograms/EDR_small.svg
-        res/pictograms/EJP_small.svg
-        res/pictograms/EVE_small.svg
-        res/pictograms/FBL_small.svg
-        res/pictograms/FEN_small.svg
-        res/pictograms/GAR_small.svg
-        res/pictograms/GLF_small.svg
-        res/pictograms/GRY_small.svg
-        res/pictograms/GTR_small.svg
-        res/pictograms/HBL_small.svg
-        res/pictograms/HOC_small.svg
-        res/pictograms/JUD_small.svg
-        res/pictograms/MPN_small.svg
-        res/pictograms/MTB_small.svg
-        res/pictograms/OWS_small.svg
-        res/pictograms/ROW_small.svg
-        res/pictograms/RU7_small.svg
-        res/pictograms/SAL_small.svg
-        res/pictograms/SHO_small.svg
-        res/pictograms/SKB_small.svg
-        res/pictograms/SRF_small.svg
-        res/pictograms/SWA_small.svg
-        res/pictograms/SWM_small.svg
-        res/pictograms/TEN_small.svg
-        res/pictograms/TKW_small.svg
-        res/pictograms/TRI_small.svg
-        res/pictograms/TTE_small.svg
-        res/pictograms/VBV_small.svg
-        res/pictograms/VVO_small.svg
-        res/pictograms/WLF_small.svg
-        res/pictograms/WPO_small.svg
-        res/pictograms/WRE_small.svg
-        res/pictograms/WRG_small.svg
+target_link_libraries(itat_challange_olympics
+PUBLIC
+	Qt6::Core
+	Qt6::Gui
+	Qt6::Widgets
+  Qt6::Network
+  Qt6::Quick
 )
-
-target_link_libraries(itat_challenge_olympics PRIVATE Qt6::Core Qt6::Quick Qt6::Network)
-
-# target_link_libraries(itat_challenge_olympics PRIVATE d3d12.lib dxgi.lib d3dcompiler.lib dxguid.lib)
--- a/EventInfoPage.qml
+++ b/EventInfoPage.qml
@ -0,0 +1,27 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+
+Page {
+  id: root
+  property string event_id
+
+  header: ToolBar {
+    ToolButton {
+      text: qsTr("Back")
+      anchors.left: parent.left
+      anchors.leftMargin: 10
+      anchors.verticalCenter: parent.verticalCenter
+      onClicked: root.StackView.view.pop()
+    }
+    Label {
+      id: pageTitle
+      font.pixelSize: 20
+      anchors.centerIn: parent
+      text: qsTr("Event Info")
+    }
+  }
+
+
+}
+
--- a/EventsPage.qml
+++ b/EventsPage.qml
@ -0,0 +1,38 @@
+import QtQuick
+import QtQuick.Controls
+
+Page {
+  id: root
+  header: ToolBar {
+    Label {
+      text: qsTr("Olympia 2024 Events")
+      font.pixelSize: 20
+      anchors.centerIn: parent
+    }
+  }
+
+  ListView {
+    id: listView
+    objectName: eventsList
+    anchors.fill: parent
+    topMargin: 48
+    leftMargin: 48
+    bottomMargin: 48
+    rightMargin: 48
+    spacing: 20
+    model: ["Albert Einstein", "Ernest Hemingway", "Hans Gude"]
+    delegate: ItemDelegate {
+      text: modelData
+      width: listView.width - listView.leftMargin - listView.rightMargin
+      height: avatar.implicitHeight + 32
+      leftPadding: avatar.implicitWidth + 32
+      onClicked: root.StackView.view.push("EventInfoPage.qml", { event_id: 1 })
+
+      Image {
+        id: avatar
+        // source: "images/" + modelData.replace(" ", "_") + ".png"
+      }
+    }
+  }
+}
+
--- a/README.md
+++ b/README.md
@ -1,170 +1,96 @@
-# Olympia 2024 Events
-> View updated Events with its Competitors and Rankings of all Disciplines 
+# ITAT_Challange_Olympics

-*Olympia 2024 Events* always displays up to date information of the 2024
-Olympics in Paris. It achieves this by fetching the `olympics.com` API. 
+## Registration for Challange

-We use the Model-View-Delegate pattern to synchronize the API data in C++ with
-the UI-Widgets defined in QML. For this we implement the API data as a Model
-which can be seen and interacted with by QML Components.
+This is my registration for the challange in "Informationstechnik und Automatisierungstechnik".
+Down below is just some auto generated stuff, which will get deleted in the future.

-All code, qml definitions and images, etc are compiled into a single binary that
-is not dependent on any resources on relative paths anymore. 
+## Getting started

-On startup the default discipline *Archery* will be fetched and shown on the
-EventsPage. From here the user has three options. You can change the discipline
-from the Dropdown-Menu (Combobox) in the top left (also note the changing
-pictograms of the discipline); Filter the EventNames with the Search field in
-the top right; or click on an Event. 
+To make it easy for you to get started with GitLab, here's a list of recommended next steps.

-When clicking on an Event, the user is redirected to the EventInfoPage. Here you
-can see Information about all Competitors that took part in the Event. When you
-are done, you can go back to the EventsPage with the button in the top left. 
+Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!

-## Galery
+## Add your files

-<table>
-<tr>
-<td><img src="doc/events_page_combobox.png"/></td>
-<td><img src="doc/events_page_textfield.png"/></td>
-<td><img src="doc/event_info.png"/></td>
-</tr>
-<tr>
-<td>Select discipline</td>
-<td>Filter by Event</td>
-<td>View Competitor</td>
-</tr>
-</table>
+- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
+- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:

-## Getting Started
-
-### Dependencies
-
- Qt6
-
-### Installation
-
-```sh
-git clone git@gitlab.kit.edu:ugmgt/itat_challenge_2024.git
-# or download release
-cd itat_challenge_2024
-cmake -B build
-cmake --build build
-./build/itat_challenge_olympics
+```
+cd existing_repo
+git remote add origin https://gitlab.kit.edu/ugmgt/itat_challange_olympics.git
+git branch -M main
+git push -uf origin main
 ```

-## Code Structure
+## Integrate with your tools

-### UML Diagram
+- [ ] [Set up project integrations](https://gitlab.kit.edu/ugmgt/itat_challange_olympics/-/settings/integrations)

-```plantuml
-@startuml
-allowmixing
-set namespaceSeparator none
-skinparam ranksep 10 
+## Collaborate with your team

-package C++ <<Frame>> {
-    class Application {
-        QGuiApplication app
-            QmlComponent component
-            SportModel model
-            FilterModel<SportModel> filter
-    }
+- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
+- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
+- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
+- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)

-    class SportModel {
-        String discipline
-            <EventInfo> model
-            request(String discipline)
-            parseData()
-    }
+## Test and Deploy

-    class FilterModel {
-        void setFilterFixedString(String)
-    }
+Use the built-in continuous integration in GitLab.

-    class EventInfo {
-        String eventName
-            List<Competitor> competitors
-    }
+- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
+- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
+- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
+- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
+- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)

-    class Competitor {
-        String name
-            String code
-            String noc
-    }
-}
+***

-package QML <<Frame>> {
+# Editing this README

-    component EventInfoPage {
-        component [Page] as EIPage {
-            component [ToolBar] as EIToolBar
-            component [ListView] as EILisView
-        }
-    }
+When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.

-    EIToolBar -[hidden]- EILisView
+## Suggestions for a good README

-    component EventsPage {
-        component [Page] as EPage {
-            component [ToolBar] as EToolBar
-            component [Column] as EColumn {
-                component [Row] as ERow {
-                    component [ComboBox] as EComboBox
-                    component [TextField] as ETextField
-                }
-                component [ListView] as EListView
-            }
-        }
-    }
+Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.

-    EToolBar -[hidden]- EColumn
-    ERow -[hidden]- EListView
+## Name
+Choose a self-explaining name for your project.

-    component application.qml {
-        component ApplicationWindow {
-            component StackView
-        }
-    }
-}
+## Description
+Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.

-'application.qml -u- a
-'Application -r- a
+## Badges
+On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.

-Application *-- "1" SportModel
-Application *-- "1" FilterModel
+## Visuals
+Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.

-FilterModel "1" o-- "1" SportModel
+## Installation
+Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.

-SportModel *-- "0..*" EventInfo
-EventInfo *-- "0..*" Competitor
+## Usage
+Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.

-Application <.l. application.qml
-StackView <.. EventInfoPage
-StackView <.. EventsPage
+## Support
+Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.

-EComboBox "request()" .> SportModel
+## Roadmap
+If you have ideas for releases in the future, it is a good idea to list them in the README.

-EComboBox -[hidden]u- ETextField
+## Contributing
+State if you are open to contributions and what your requirements are for accepting them.

-SportModel "View" .> EListView 
-FilterModel "View" .> EListView 
-ETextField "Control" .r.> FilterModel
+For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.

-EILisView <. "View" Competitor
+You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.

-cloud api.olympics.com
-() REST
-REST - api.olympics.com
+## Authors and acknowledgment
+Show your appreciation to those who have contributed to the project.

-SportModel -( REST
-
-application.qml -[hidden]u- Application
-@enduml
-```
-
-## Authors
-
- **Silas Stulz** - *Initial Work*
- **Gero Beckmann** - *Initial Work*
+## License
+For open source projects, say how it is licensed.

+## Project status
+If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
--- a/application.qml
+++ b/application.qml
@ -0,0 +1,25 @@
+import QtQuick
+import QtQuick.Controls
+
+ApplicationWindow {
+  width: 400
+  height: 400
+  visible: true
+
+  TreeView {
+    id: listView
+    anchors.fill: parent
+    model: sports // This will reference the model added to the context
+    delegate: ItemDelegate { 
+      text: eventName
+    }
+    Component.onCompleted : console.log(Object.keys(sports.data))
+  }
+
+  // StackView {
+  //   id: stackView
+  //   anchors.fill: parent
+  //   initialItem: EventsPage {}
+  // }
+}
+
--- a/doc/README.md
+++ b/doc/README.md
@ -1,86 +0,0 @@
-# ITAT_Challange_Olympics
-
-## Registration for Challange
-
-This is my registration for the challange in "Informationstechnik und Automatisierungstechnik".
-
-## Information Gathering
-
-Overview:
-https://olympics.com/en/paris-2024/sports
-
-Pictograms:
-https://olympics.com/en/paris-2024/the-games/the-brand/pictograms
-
-### API Request for Archery Data (replace ARC with other short from table below for different disciplines):
-```js
-await (await fetch("https://sph-s-api.olympics.com/summer/schedules/api/ENG/schedule/discipline/ARC", {
-  "method": "GET",
-})).json();
-```
-
-**NOTE:** You can switch between API and mock data in "src/api/OlympicsAPI.h" with the defined value "USE_API_REQUEST".
-
-### Table for discipline short names from the IOC (International Olympics Comittee):
-
-|Sport|Short|
-|---|---|
-|AquaticsArtisticSwimming|SWA|
-|AquaticsDiving|DIV|
-|AquaticsMarathonSwimming|OWS|
-|AquaticsSwimming|SWM|
-|AquaticsWaterPolo|WPO|
-|Archery|ARC|
-|Athletics|ATH|
-|Badminton|BDM|
-|Basketball3v3|BK3|
-|Basketball|BKB|
-|Boxing|BOX|
-|Breaking|BKG|
-|CanoeingSprint|CSP|
-|CanoeingSlalom|CSL|
-|CyclingBMXFreestyle|BMF|
-|CyclingBMXRacing|BMX|
-|CyclingMaountainBike|MTB|
-|CyclingRoad|CRD|
-|CyclingTrack|CTR|
-|EquestrianDressage|EDR|
-|EquestrianEventing|EVE|
-|EquestrianJumping|EJP|
-|Fencing|FEN|
-|FieldHockey|HOC|
-|Football|FBL|
-|Golf|GLF|
-|GymnasticsArtistic|GAR|
-|GymnasticsRhythmic|GRY|
-|GymnasticsTrampoline|GTR|
-|HandballIndoor|HBL|
-|Judo|JUD|
-|ModernPentathlon|MPN|
-|Rowing|ROW|
-|Rugby7|RU7|
-|Sailing|SAL|
-|Shooting|SHO|
-|Skateboarding|SKB|
-|SportClimbing|CLB|
-|Surfing|SRF|
-|TableTennis|TTE|
-|Taekwondo|TKW|
-|Tennis|TEN|
-|Triathlon|TRI|
-|VolleyballBeach|VBV|
-|VolleyballIndoor|VVO|
-|Weightlifting|WLF|
-|WrestlingFreestyle|WRE|
-|WrestlingGrecoRoman|WRG|
-
-### Sport Specifics
-
-Archery:
- rules: https://olympics.com/en/paris-2024/sports/archery
- explanation: https://www.nbcphiladelphia.com/paris-2024-summer-olympics/olympics-archery-rules-events-history/3783592/
- competition schedule: https://olympics.com/en/paris-2024/schedule/archery
- participating nations/athletes: https://en.wikipedia.org/wiki/Archery_at_the_2024_Summer_Olympics_%E2%80%93_Qualification
-
-Taekwondo:
- rules: https://olympics.com/en/paris-2024/sports/taekwondo
--- a/doc/event_info.png
+++ b/doc/event_info.png
--- a/doc/events_page_combobox.png
+++ b/doc/events_page_combobox.png
--- a/doc/events_page_textfield.png
+++ b/doc/events_page_textfield.png
--- a/external/QJsonModel
+++ b/external/QJsonModel
@ -0,0 +1 @@
+Subproject commit ed3652666d4954c2262eb5ceee8fda3e613f8c0c
--- a/main.cpp
+++ b/main.cpp
@ -0,0 +1,101 @@
+#include <QGuiApplication>
+#include <QQmlEngine>
+#include <QQmlContext>
+#include <QQmlComponent>
+
+// networking
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QUrl>
+#include <QUrlQuery>
+
+// json parsing
+#include <QJsonValue>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QVariantMap>
+#include <QJsonArray>
+
+// console output
+#include <QDebug>
+#include <qlogging.h>
+// #include <iostream>
+
+#include "QJsonModel.hpp"
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QQmlEngine engine;
+    QQmlContext *objectContext = new QQmlContext(engine.rootContext());
+
+
+    QStringList dataList = {
+      "Item 1",
+      "Item 2",
+      "Item 3",
+      "Item 4"
+    };
+
+    //objectContext->setContextProperty("sports", QVariant::fromValue(dataList));
+
+    //QQmlComponent component(&engine, "application.qml");
+    //QObject *object = component.create(objectContext);
+    // QObject *eventsList = object->findChild<QObject*>("eventsList");
+    // QQmlContext *componentContext = component.creationContext();
+    // ... delete object and objectContext when necessary
+
+
+
+   // create custom temporary event loop on stack
+    QEventLoop eventLoop;
+
+    // "quit()" the event-loop, when the network request "finished()"
+    QNetworkAccessManager mgr;
+    QObject::connect(&mgr, SIGNAL(finished(QNetworkReply*)), &eventLoop, SLOT(quit()));
+
+    QString endpoint { "https://sph-s-api.olympics.com/summer/schedules/api/ENG/schedule/discipline/ARC" };
+
+    // the HTTP request
+    QNetworkRequest req( (QUrl( endpoint )) );
+    QNetworkReply *reply = mgr.get(req);
+    eventLoop.exec(); // blocks stack until "finished()" has been called
+
+    if (reply->error() == QNetworkReply::NoError) {
+        //success
+
+        QString strReply = (QString)reply->readAll();
+
+
+        //parse json
+        // qDebug() << "Response:" << strReply;
+        QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8());
+        QJsonObject jsonObj = jsonResponse.object();
+
+        QJsonModel * model = new QJsonModel();
+        // qDebug() << QJsonDocument(jsonObj["units"].toArray()).toJson();
+        // model->loadJson(QJsonDocument(jsonObj["units"].toArray()).toJson());
+        model->loadJson(strReply.toUtf8());
+
+        objectContext->setContextProperty("sports", QVariant::fromValue(model));
+        // componentContext->setContextProperty("sports", model);
+
+        // objectContext->setContextProperty("sports", QVariant::fromValue(dataList));
+
+        QQmlComponent component(&engine, "application.qml");
+        QObject *object = component.create(objectContext);
+        
+        qDebug() << "Competitor:" << jsonObj["units"][0]["competitors"][0]["name"].toString();
+
+        delete reply;
+    }
+    else {
+        //failure
+        qDebug() << "Failure" <<reply->errorString();
+        delete reply;
+    }
+
+    return app.exec();
+}
--- a/res/gui/EventInfoPage.qml
+++ b/res/gui/EventInfoPage.qml
@ -1,60 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-
-Page {
-  id: root
-  required property string eventName
-  required property list<QtObject> competitors
-
-  header: ToolBar {
-    ToolButton {
-      text: qsTr("Back")
-      anchors.left: parent.left
-      anchors.leftMargin: 10
-      anchors.verticalCenter: parent.verticalCenter
-      onClicked: root.StackView.view.pop()
-    }
-    Label {
-      id: pageTitle
-      font.pixelSize: 20
-      anchors.centerIn: parent
-      text: eventName
-    }
-  }
-
-  ListView {
-    id: listView
-    anchors.fill: parent
-    topMargin: 48
-    leftMargin: 48
-    bottomMargin: 48
-    rightMargin: 48
-    spacing: 20
-    model: competitors
-    delegate: ItemDelegate {
-      required property string name
-      required property string noc
-      required property string mark
-      required property string statistic
-      required property string gold
-      required property string silver
-      required property string bronze
-      width: listView.width - listView.leftMargin - listView.rightMargin
-      height: 32
-      Text { 
-        anchors.left: parent.left
-        text: name + " (" + noc + ")"
-      }
-      Text { 
-        anchors.right: parent.right
-        horizontalAlignment: Text.AlignRight
-        text: mark + " " + statistic + " | " + gold + "🥇 " + silver + "🥈 " + bronze + "🥉"
-      }
-
-    }
-  }
-
-
-}
-
--- a/res/gui/EventsPage.qml
+++ b/res/gui/EventsPage.qml
@ -1,275 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Page {
-  id: root
-  header: ToolBar {
-    Label {
-      text: qsTr("Olympia 2024 Events")
-      font.pixelSize: 20
-      anchors.centerIn: parent
-    }
-  }
-
-  Column {
-    anchors.fill: parent
-    anchors.topMargin: 24
-    anchors.leftMargin: 48
-    anchors.bottomMargin: 48
-    anchors.rightMargin: 48
-    spacing: 24
-    
-    Row {
-      // width: parent.width
-      // height: 50
-      spacing: 20
-
-
-      ComboBox {
-        width: 300
-        height: 50
-
-        displayText: "Discipline: " + currentText
-        model: myListModel
-        textRole: "text"
-
-        ListModel {
-          id: myListModel
-          ListElement {
-            text: "AquaticsArtisticSwimming"    
-            api: "SWA"
-          }
-          ListElement {
-            text: "AquaticsDiving"              
-            api: "DIV"
-          }
-          ListElement {
-            text: "AquaticsMarathonSwimming"    
-            api: "OWS"
-          }
-          ListElement {
-            text: "AquaticsSwimming"            
-            api: "SWM"
-          }
-          ListElement {
-            text: "AquaticsWaterPolo"           
-            api: "WPO"
-          }
-          ListElement {
-            text: "Archery"                     
-            api: "ARC"
-          }
-          ListElement {
-            text: "Athletics"                   
-            api: "ATH"
-          }
-          ListElement {
-            text: "Badminton"                   
-            api: "BDM"
-          }
-          ListElement {
-            text: "Basketball3v3"               
-            api: "BK3"
-          }
-          ListElement {
-            text: "Basketball"                  
-            api: "BKB"
-          }
-          ListElement {
-            text: "Boxing"                      
-            api: "BOX"
-          }
-          ListElement {
-            text: "Breaking"                    
-            api: "BKG"
-          }
-          ListElement {
-            text: "CanoeingSprint"              
-            api: "CSP"
-          }
-          ListElement {
-            text: "CanoeingSlalom"              
-            api: "CSL"
-          }
-          ListElement {
-            text: "CyclingBMXFreestyle"         
-            api: "BMF"
-          }
-          ListElement {
-            text: "CyclingBMXRacing"            
-            api: "BMX"
-          }
-          ListElement {
-            text: "CyclingMaountainBike"        
-            api: "MTB"
-          }
-          ListElement {
-            text: "CyclingRoad"                 
-            api: "CRD"
-          }
-          ListElement {
-            text: "CyclingTrack"                
-            api: "CTR"
-          }
-          ListElement {
-            text: "EquestrianDressage"          
-            api: "EDR"
-          }
-          ListElement {
-            text: "EquestrianEventing"          
-            api: "EVE"
-          }
-          ListElement {
-            text: "EquestrianJumping"           
-            api: "EJP"
-          }
-          ListElement {
-            text: "Fencing"                     
-            api: "FEN"
-          }
-          ListElement {
-            text: "FieldHockey"                 
-            api: "HOC"
-          }
-          ListElement {
-            text: "Football"                    
-            api: "FBL"
-          }
-          ListElement {
-            text: "Golf"                        
-            api: "GLF"
-          }
-          ListElement {
-            text: "GymnasticsArtistic"          
-            api: "GAR"
-          }
-          ListElement {
-            text: "GymnasticsRhythmic"          
-            api: "GRY"
-          }
-          ListElement {
-            text: "GymnasticsTrampoline"        
-            api: "GTR"
-          }
-          ListElement {
-            text: "HandballIndoor"              
-            api: "HBL"
-          }
-          ListElement {
-            text: "Judo"                        
-            api: "JUD"
-          }
-          ListElement {
-            text: "ModernPentathlon"            
-            api: "MPN"
-          }
-          ListElement {
-            text: "Rowing"                      
-            api: "ROW"
-          }
-          ListElement {
-            text: "Rugby7"                      
-            api: "RU7"
-          }
-          ListElement {
-            text: "Sailing"                     
-            api: "SAL"
-          }
-          ListElement {
-            text: "Shooting"                    
-            api: "SHO"
-          }
-          ListElement {
-            text: "Skateboarding"               
-            api: "SKB"
-          }
-          ListElement {
-            text: "SportClimbing"               
-            api: "CLB"
-          }
-          ListElement {
-            text: "Surfing"                     
-            api: "SRF"
-          }
-          ListElement {
-            text: "TableTennis"                 
-            api: "TTE"
-          }
-          ListElement {
-            text: "Taekwondo"                   
-            api: "TKW"
-          }
-          ListElement {
-            text: "Tennis"                      
-            api: "TEN"
-          }
-          ListElement {
-            text: "Triathlon"                   
-            api: "TRI"
-          }
-          ListElement {
-            text: "VolleyballBeach"             
-            api: "VBV"
-          }
-          ListElement {
-            text: "VolleyballIndoor"            
-            api: "VVO"
-          }
-          ListElement {
-            text: "Weightlifting"               
-            api: "WLF"
-          }
-          ListElement {
-            text: "WrestlingFreestyle"          
-            api: "WRE"
-          }
-          ListElement {
-            text: "WrestlingGrecoRoman"         
-            api: "WRG"
-          }
-        }
-        Component.onCompleted: currentIndex = 5; 
-        onActivated: {
-          if (currentIndex >= 0) {
-            console.log(currentValue.api);
-            sports.request(currentValue.api)
-          }
-        }
-      }
-      TextField {
-        height: 50
-        width: 200
-        placeholderText: "Search"
-        onTextChanged: filter.setFilterFixedString(text)
-      }
-    }
-
-    ListView {
-      id: listView
-      // anchors.fill: parent
-      // topMargin: 48
-      height: parent.height
-      width: parent.width
-      spacing: 20
-      model: filter
-      delegate: ItemDelegate {
-        required property string eventName
-        required property list<QtObject> competitors
-        text: eventName
-        width: listView.width - listView.leftMargin - listView.rightMargin
-        height: avatar.height 
-        leftPadding: avatar.width + 16
-        onClicked: root.StackView.view.push("EventInfoPage.qml", { eventName, competitors })
-
-        Image {
-          id: avatar
-          height: 32
-          width: 32
-          source: "qrc:/qt/qml/itat/res/pictograms/" + sports.discipline + "_small.svg"
-        }
-      }
-    }
-
-  }
-}
-
--- a/res/gui/application.qml
+++ b/res/gui/application.qml
@ -1,15 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-  width: 400
-  height: 400
-  visible: true
-
-  StackView {
-    id: stackView
-    anchors.fill: parent
-    initialItem: EventsPage {}
-  }
-}
-
--- a/res/mock/ARC.json
+++ b/res/mock/ARC.json
--- a/res/mock/JUD.json
+++ b/res/mock/JUD.json
--- a/res/pictograms/ARC_small.svg
+++ b/res/pictograms/ARC_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M541.7,534.6c93.7-97.5,93.7-251.8,0-349.2l36.3-36.3c37,35.2,87,56.9,142,56.9v-16c-50.6,0-96.6-19.9-130.7-52.2l57.8-57.8h22.3l50.6-51.1h-28.9V0l-51.1,50.7v22.3l-57.8,57.8c-32.3-34.2-52.2-80.2-52.2-130.8h-16c0,55,21.7,105,56.9,142l-36.3,36.3c-97.5-93.7-251.8-93.7-349.2,0l-36.3-36.3C184.3,105,206,55,206,0h-16c0,50.6-19.9,96.6-52.2,130.7l-57.8-57.8v-22.2L28.9,0v28.9H0l50.7,51.1h22.3l57.8,57.8C96.6,170.1,50.6,190,0,190v16c55,0,105-21.7,142-56.9l36.3,36.3c-93.7,97.5-93.7,251.8,0,349.2l-36.3,36.3c-37-35.2-87-56.9-142-56.9v16c50.6,0,96.6,19.9,130.7,52.2l-57.8,57.8h-22.2L0,691.1h28.9v28.9l51.1-50.7v-22.3l57.8-57.8c32.3,34.2,52.2,80.2,52.2,130.8h16c0-55-21.7-105-56.9-142l36.3-36.3c97.5,93.7,251.8,93.7,349.2,0l36.3,36.3c-35.2,37-56.9,87-56.9,142h16c0-50.6,19.9-96.6,52.2-130.7l57.8,57.8v22.3l51.1,50.7v-28.9h28.9l-50.7-51.2h-22.3l-57.8-57.8c34.2-32.3,80.2-52.2,130.8-52.2v-16c-55,0-105,21.7-142,56.9l-36.3-36.3ZM523.3,189.6l-14.1,14.1c-83.4-79.7-214.9-79.7-298.3,0l-14.1-14.1c91.1-87.5,235.3-87.5,326.5,0ZM378.5,378.3l23,16.2c-2.1,2.5-4.5,4.9-7,7l-16.2-23c-10.1,10-26.4,10-36.5,0l-16.2,23c-2.5-2.1-4.9-4.5-7-7l23-16.2c-10-10.1-10-26.4,0-36.5l-23-16.3c2.1-2.5,4.5-4.9,7-7l16.3,23c10.1-10,26.4-10,36.5,0l16.2-23c2.5,2.1,4.9,4.5,7,7l-23,16.2c9.9,10.2,9.9,26.4,0,36.6ZM394.5,318.4c-19.9-16.6-49-16.6-69,0l-18.4-18.4c30.2-26.7,75.6-26.7,105.8,0l-18.4,18.4ZM318.4,325.5c-16.6,19.9-16.6,49,0,69l-18.4,18.4c-26.7-30.2-26.7-75.6,0-105.8l18.4,18.4ZM325.5,401.5c19.9,16.6,49,16.6,69,0l18.4,18.4c-30.2,26.7-75.6,26.7-105.8,0l18.4-18.4ZM401.5,394.5c16.6-19.9,16.6-49,0-69l18.4-18.4c26.7,30.2,26.7,75.6,0,105.8l-18.4-18.4ZM287.3,280.2l-18.4-18.4c51.3-47.7,130.9-47.7,182.3,0l-18.4,18.4c-41.2-37.6-104.4-37.6-145.5,0ZM280.2,287.3c-37.6,41.2-37.6,104.3,0,145.5l-18.4,18.4c-47.7-51.3-47.7-130.9,0-182.3l18.4,18.4ZM287.3,439.8c41.2,37.6,104.3,37.6,145.5,0l18.4,18.4c-51.3,47.7-130.9,47.7-182.3,0l18.4-18.4ZM439.8,432.7c37.6-41.2,37.6-104.3,0-145.5l18.4-18.4c47.7,51.3,47.7,130.9,0,182.3l-18.4-18.4ZM249.1,242l-18.4-18.4c72.4-68.8,186.2-68.8,258.6,0l-18.4,18.4c-62.3-58.6-159.5-58.6-221.8,0ZM242,249.1c-58.6,62.3-58.6,159.6,0,221.9l-18.4,18.4c-68.8-72.4-68.8-186.2,0-258.6l18.4,18.3ZM249.1,478c62.3,58.6,159.6,58.6,221.9,0l18.4,18.4c-72.5,68.8-186.2,68.8-258.6,0l18.3-18.4ZM478,470.9c58.6-62.3,58.6-159.6,0-221.9l18.4-18.4c68.8,72.4,68.8,186.2,0,258.6l-18.4-18.3ZM189.6,196.7l14.1,14.1c-79.7,83.4-79.7,214.9,0,298.3l-14.1,14.1c-87.5-91.1-87.5-235.3,0-326.5ZM196.7,530.4l14.1-14.1c83.4,79.7,214.9,79.7,298.3,0l14.1,14.1c-91.1,87.5-235.3,87.5-326.5,0ZM530.4,523.3l-14.1-14.1c79.7-83.4,79.7-214.9,0-298.3l14.1-14.1c87.5,91.1,87.5,235.3,0,326.5Z"/>
-  </g>
-</svg>
--- a/res/pictograms/ATH_small.svg
+++ b/res/pictograms/ATH_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M137.1,198.7L335.8,0l7.1,7.1-209.9,209.8c2-5.8,3.4-11.8,4.1-18.2ZM180.1,79.3L252.3,7.1l-7-7.1-71.8,71.8c2.9,2.3,5.1,4.8,6.6,7.5ZM108.9,193.5c3.5-49.4,11.1-65.9,27.8-86.2,9.7-11.8,16-25.5,18.6-35.4-.5-.2-.9-.4-1.4-.7-17.8-7.8-33.3-13-45.2-15.4-12.7-2.4-19-3.1-22.7,1,20.9,26.9,2.4,63.9-31.1,66.6,0,0,.7,7.3,1.5,18.1l22.4-11.5c2.5-1.3,5.5-.3,6.7,2.2,1.3,2.5.3,5.5-2.2,6.7l-26.3,13.4c0,2.6.3,5.4.4,8.2l17.7-9c2.5-1.3,5.5-.3,6.7,2.2,1.3,2.5.3,5.5-2.2,6.7l-21.8,11.2c0,2.8,0,5.5.2,8.3l13.5-6.9c2.5-1.3,5.5-.3,6.7,2.2,1.3,2.5.3,5.5-2.2,6.7l-18.1,9.2c0,1.2,0,2.5,0,3.7,0,1.7-.2,3.3-.3,4.9l10.3-5.3c2.5-1.3,5.5-.3,6.7,2.2,1.3,2.5.3,5.5-2.2,6.7l-16.6,8.5c-4.7,23.3-15.7,42.9-17.2,58,0,.7,0,1.4,0,2,43.4-20.7,68.4-48.5,70.5-78.3ZM118.9,194.2c-2.4,33.6-29.4,64.2-76.1,86.6,2.6,2,6.3,2.8,10.6,1.4,2.2-.7,7.1-3,13.5-6.7l4.7,5.3-2.2-6.8c6.6-4,14.5-9.4,22.2-16.2l6.3,5.3-4.1-7.2c7.4-6.6,14.5-14.4,20.3-23.3l5.8,2.7-4.5-4.6c6.4-10.4,11-22.2,12-35.3.9-12.7,2.5-23.3,4.5-32.4,8-30.8,23.5-42.3,30.7-52.8,10.9-15.9,15.4-24.3,1.5-32.8-3.4,11.3-10.1,24.7-19.6,36.2-14.8,18-22.1,31.7-25.6,80.6ZM720,199.7l-64.2,64.2c.9,29-4.1,58.1-15.3,85.3l68.2-68.2,11.3,11.3-303.1,303.2c-80.6,80.6-211.8,80.6-292.4,0-16.3-16.3-29.3-34.7-39-54.3l-74.2,74.2-11.3-11.4,78.6-78.6c-7.1-18.1-11.6-37-13.5-56.1l-58,58-7.1-7,64.2-64.2c-.9-29,4.1-58.1,15.3-85.3L11.3,439l-11.3-11.4L303.1,124.5c80.6-80.6,211.8-80.6,292.4,0,16.3,16.3,29.3,34.7,39,54.3l74.2-74.2,11.3,11.4-78.6,78.6c7.1,18.1,11.6,37,13.5,56.1l58-58,7.1,7ZM80.3,440L340,180.4c55.1-55.1,144.6-55.1,199.7,0,16.9,16.9,28.5,37,35.1,58.3l47.8-47.8c-9.2-19.9-21.9-38.6-38.3-55-74.4-74.4-195.4-74.4-269.7,0l-178.7,178.5c-34.9,34.8-53.4,79.9-55.6,125.6ZM511,302.3l55.6-55.6c-5.7-21.7-17-42.3-34-59.3-51.2-51.2-134.4-51.2-185.5,0l-159.7,159.6c-29.2,29.2-41.7,68.9-37.6,107.1l222.2-222.1c32-32,84-32,116,0s26.8,45.4,23,70.3ZM476.6,336.7h0c25.7-25.8,25.7-67.6,0-93.3s-67.6-25.7-93.4,0l-140,140c-25.7,25.7-25.7,67.6,0,93.4,25.7,25.7,67.6,25.7,93.4,0l140-140.1ZM153.4,473.2c5.7,21.7,17,42.3,34,59.3,51.2,51.2,134.4,51.2,185.5,0l159.6-159.5c29.2-29.2,41.7-68.9,37.6-107.1l-222.1,222.1c-32,32-84,32-116,0s-26.8-45.4-23-70.3l-55.6,55.5ZM91,513l50-50c-4.4-26.5-1.2-54.1,9.6-79.1l-70.4,70.4c.5,19.9,4.1,39.7,10.8,58.7ZM639.7,280l-259.7,259.6c-55.1,55.1-144.6,55.1-199.7,0-16.9-16.9-28.5-37-35.1-58.3l-47.8,47.8c9.2,19.9,21.9,38.6,38.3,55,74.4,74.4,195.4,74.4,269.7,0l178.6-178.5h0c35-34.9,53.5-79.9,55.7-125.6ZM639.8,265.7c-.5-19.9-4.1-39.8-10.8-58.8l-50,50c4.4,26.5,1.2,54.1-9.6,79.1l70.4-70.3ZM587,503.1l-209.9,209.8,7.1,7.1,198.7-198.7c.7-6.4,2.1-12.4,4.1-18.2ZM539.8,640.7l-72.2,72.2,7.1,7.1,71.8-71.8c-2.9-2.3-5.1-4.8-6.7-7.5ZM611.1,526.5c-3.5,49.4-11.1,65.9-27.8,86.2-9.7,11.8-16,25.5-18.6,35.4.5.2.9.4,1.4.7,17.8,7.8,33.3,13,45.2,15.4,12.7,2.5,19.1,3.2,22.7-.9-20.9-26.9-2.4-63.9,31.1-66.6,0,0-.7-7.3-1.5-18.1l-22.4,11.4c-2.5,1.3-5.5.3-6.7-2.2-1.3-2.5-.3-5.5,2.2-6.7l26.3-13.4c0-2.6-.3-5.4-.4-8.2l-17.7,9c-2.5,1.3-5.5.3-6.7-2.2-1.3-2.5-.3-5.5,2.2-6.7l21.8-11.2c0-2.8,0-5.5-.2-8.3l-13.5,6.9c-2.5,1.3-5.5.3-6.7-2.2-1.3-2.5-.3-5.5,2.2-6.7l18.1-9.2c0-1.2,0-2.5,0-3.7,0-1.7.2-3.3.3-4.9l-10.3,5.3c-2.5,1.3-5.5.3-6.7-2.2s-.3-5.5,2.2-6.7l16.6-8.5c4.7-23.3,15.7-42.9,17.2-58,0-.7,0-1.4,0-2-43.4,20.7-68.4,48.5-70.5,78.3ZM601.1,525.8c2.4-33.6,29.4-64.2,76.1-86.6-2.6-2-6.3-2.8-10.6-1.4-2.2.7-7.1,3-13.5,6.7l-4.7-5.3,2.2,6.8c-6.6,4-14.5,9.4-22.2,16.2l-6.3-5.3,4.1,7.2c-7.4,6.6-14.5,14.4-20.3,23.3l-5.8-2.7,4.5,4.6c-6.4,10.4-11,22.2-12,35.3-.9,12.7-2.5,23.3-4.5,32.4-8,30.8-23.5,42.3-30.7,52.8-10.9,15.9-15.4,24.3-1.5,32.8,3.4-11.3,10.1-24.7,19.6-36.2,14.8-18,22.1-31.7,25.6-80.6Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BDM_small.svg
+++ b/res/pictograms/BDM_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M43,417.2l-7.4-7.4,13.4-30.5,10.4,10.4-16.4,27.5ZM152,223.4l-87-87,71.3-71.4,87,87-7.1,7.1-16-16-25.1,25.1,16,16-7.1,7.1-16-16-25,25.1,16,16-7,7ZM168.3,111.1l-25.1,25.1,24.9,24.9,25.1-25.1-24.9-24.9ZM111.2,104.2l24.9,24.9,25.1-25.1-24.9-24.9-25.1,25.1ZM104,161.3l25.1-25.1-24.9-24.9-25.1,25.1,24.9,24.9ZM136,193.3l25.1-25.1-24.9-24.9-25.2,25.1,25,24.9ZM76.5,464.9l-45.1-45.1-7.1,7.1,45.1,45.1,7.1-7.1ZM9.3,441.9c-12.4,12.4-12.4,32.6,0,45.1,12.4,12.5,32.6,12.4,45.1,0l7.9-7.9-45.1-45.1-7.9,7.9ZM122.2,284.7l-7.8-22.8c-1-2.9-3.6-4.9-6.7-5s-5.9,1.6-7.1,4.5l-47.3,108.1,11.4,11.4,57.5-96.2ZM130.2,277.1l203.6-203.6-7.1-7.1-200.1,200.2,3.6,10.5ZM207,365l-2.5-22.9c-.3-3.2-2.7-5.7-5.8-6.3l-26.5-4.8-78.7,78.7,14.5,14.5,99-59.2ZM50.3,424.5l7.2,7.2,21.9-21.9-12.7-12.8-16.4,27.5ZM154.1,291.7l-22.9-2.5-59.3,99,14.5,14.5,78.7-78.7-4.8-26.5c-.5-3.1-3-5.5-6.2-5.8ZM229.6,369.6L525.7,73.5l-7.1-7.1L219.1,366l10.5,3.6ZM99.2,429.5l-12.7-12.7-21.9,21.9,7.2,7.2,27.4-16.4ZM116.9,447.2l-10.4-10.4-27.5,16.4,7.4,7.4,30.5-13.4ZM312.2,255l7.1-7.1-23.1-23.1-71.4,71.4,23.1,23.1,7.1-7.1-16-16,25.1-25.1,16,16,7.1-7.1-16-16,25.1-25.1,15.9,16.1ZM183.9,241.2l-7.1,7.1,23.1,23.1,71.4-71.4-23.1-23.1-7.1,7.1,16,16-25.1,25.1-16-16-7.1,7.1,16,16-25.1,25.1-15.9-16.1ZM234.8,395.5c2.8-1.2,4.6-4,4.5-7.1s-2.1-5.7-5-6.7l-22.8-7.8-96.2,57.5,11.4,11.4,108.1-47.3ZM174.9,321.3l6,1.1,248.9-248.9-7.1-7.1-248.9,248.9,1.1,6ZM536.1,478.9l7.1-7.1-23.1-23.1-71.4,71.4,23.1,23.1,7.1-7.1-16-16,25.1-25.1,16,16,7.1-7.1-16-16,25.1-25.1,15.9,16.1ZM589.8,443l-203.7,203.6,7.1,7.1,200.1-200.1-3.5-10.6ZM407.8,465.1l-7.1,7.1,23.1,23.1,71.4-71.4-23.1-23.1-7.1,7.1,16,16-25.1,25.1-16-16-7.1,7.1,16,16-25.1,25.1-15.9-16.1ZM568,496.7l87,87-71.4,71.4-87-87,7.1-7.1,16,16,25.1-25.1-16-16,7.1-7.1,16,16,25.1-25.1-16-16,7-7ZM551.7,609l25.1-25.1-24.9-24.9-25.1,25.1,24.9,24.9ZM608.8,615.9l-24.9-24.9-25.1,25.1,24.9,24.9,25.1-25.1ZM616,558.8l-25.1,25.1,24.9,24.9,25.1-25.1-24.9-24.9ZM584,526.8l-25,25.1,24.9,24.9,25.1-25.1-25-24.9ZM545.1,398.8l-6-1.1-248.9,248.9,7.1,7.1,248.9-248.9-1.1-6ZM597.8,435.4l7.8,22.8c1,2.9,3.6,4.9,6.7,5,3.1.1,5.9-1.6,7.1-4.5l47.4-108.1-11.4-11.4-57.6,96.2ZM643.5,255.3l45.1,45.1,7.1-7.1-45.1-45.1-7.1,7.1ZM710.7,233.2c-12.4-12.4-32.6-12.4-45.1,0l-7.9,7.9,45.1,45.1,7.9-7.9c12.4-12.5,12.4-32.7,0-45.1ZM660.6,330.4l10.4,10.4,13.4-30.5-7.4-7.4-16.4,27.5ZM330,401.4l-252.3,252.3-11.3-11.3,252.3-252.3-45.9-45.9,7.1-7.1,16,16,25.1-25.1-16-16,7.1-7.1,16,16,25.1-25.1-16-16,7.1-7.1,45.9,45.9,252.2-252.2,11.3,11.3-252.4,252.3,45.9,45.9-7.1,7.1-16-16-25.1,25.1,16,16-7.1,7.1-16-16-25.1,25.1,16,16-7,7-45.8-45.9ZM384.9,392l-22.8-22.8-25.1,25.1,22.8,22.8,25.1-25.1ZM369.2,362.2l22.8,22.8,25.1-25.1-22.8-22.8-25.1,25.1ZM335.1,328.1l22.8,22.8,25.1-25.1-22.8-22.8-25.1,25.1ZM325.7,383l25.1-25.1-22.8-22.7-25.1,25.1,22.8,22.7ZM521.3,384.3l26.5,4.8,78.7-78.7-14.5-14.5-99,59.3,2.5,22.9c.3,3.1,2.7,5.7,5.8,6.2ZM490.4,350.6l-296.1,296,7.1,7.1,299.6-299.6-10.6-3.5ZM485.1,324.6c-2.8,1.2-4.6,4-4.5,7.1s2.1,5.7,5,6.7l22.8,7.8,96.2-57.5-11.4-11.4-108.1,47.3ZM603.1,272.9l10.4,10.4,27.5-16.4-7.4-7.4-30.5,13.4ZM565.9,428.4l22.9,2.5,59.3-99-14.5-14.5-78.7,78.7,4.8,26.5c.4,3.1,3,5.5,6.2,5.8ZM620.8,290.6l12.7,12.7,21.9-21.9-7.2-7.2-27.4,16.4ZM669.7,295.6l-7.2-7.2-21.9,21.9,12.7,12.7,16.4-27.4Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BK3_small.svg
+++ b/res/pictograms/BK3_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M674,257.4c-43.9-43.9-107.4-56.4-162.5-37.5l142.3-142.4-11.3-11.3-202.4,202.4h22.6c55.2-55,144.8-55,199.9.1,55.2,55.2,55.2,144.9,0,200.1l-91.2,91.3-43.7-43.7,107.4-107.4-80.3-80.3-2.7,11.4,68.8,68.8-100.2,100.4-58.2-58.2h-22.6l202.6,202.6,11.3-11.3-71-71,91.2-91.3c61.3-61.3,61.3-161.3,0-222.7ZM257.5,451.2h0c-55.2,55.2-145,55.2-200.1,0-55.2-55.2-55.2-144.9,0-200.1l91.2-91.3,43.7,43.7-107.4,107.4,82.3,82.3,2.7-11.5-70.9-70.8,100.3-100.3,58,58h22.6L77.5,66.2l-11.3,11.3,71,71-91.2,91.3c-61.4,61.4-61.4,161.3,0,222.7,43.9,43.9,107.4,56.4,162.5,37.5l-142.3,142.5,11.3,11.3,202.6-202.6h-22.6ZM542.2,338.8l-25.1,20.2,16.4,19.7-9.2,38.9-31.1,23.6h-42.5l8.9-37.8h9.1l5.8-24.9h-25.3l9.3-40.1h25l5.3-21.9h-19.3l8.8-37.8h52.9l19.7,23.7-8.7,36.4ZM436,403.4h11.4l-8.9,37.8h-31.5l-122.6-124.6h-11.4l8.6-38h31.7l122.7,124.8ZM233.8,403.5h19.3l-8.8,37.7h-52.9l-19.6-23.8,8.9-38.3,25.2-20.2-16.4-19.7,8.9-36.8,30.8-23.7h40.2l-8.9,38.3h-6.5l-5.4,22.2h25.3l-9.3,40.1h-25l-5.8,24.2ZM317.8,368l31.1,31.3-42.1,41.9h-50.4l8.8-37.7h16.6l36-35.5ZM402.3,351.7l-31.1-31.1,42.4-42h52.5l-8.8,37.8h-18.9l-36.1,35.3ZM315,99.6c-1.5-26.6-10.8-51.7-26.6-72.8,17.2-15.2,39.3-25,63.6-26.8v99.6h-37ZM431.6,26.8c-17.2-15.2-39.3-25-63.6-26.8v99.6h37c1.6-26.5,10.8-51.7,26.6-72.8ZM298.9,115.6h-46.6c1.7,23.2,10.7,44.4,24.8,61.2,12.8-17.9,20.4-38.9,21.8-61.2ZM298.9,99.6c-1.5-22.2-9-43.3-21.8-61.2-14.1,16.8-23.1,38-24.8,61.2h46.6ZM405,115.6h-37v99.6c24.3-1.8,46.4-11.6,63.6-26.8-15.8-21-25-46.2-26.6-72.8ZM421.1,99.6h46.6c-1.7-23.2-10.7-44.3-24.8-61.1-12.8,17.9-20.4,38.9-21.8,61.1ZM421.1,115.6c1.5,22.2,9,43.3,21.8,61.2,14.1-16.8,23.1-38,24.8-61.2,0,0-46.6,0-46.6,0ZM352,115.6h-37c-1.5,26.6-10.8,51.7-26.6,72.8,17.2,15.2,39.3,25,63.6,26.8v-99.6ZM368,620.4v99.6c24.3-1.8,46.4-11.6,63.6-26.8-15.8-21.1-25-46.2-26.6-72.8h-37ZM288.4,693.2c17.2,15.2,39.3,25,63.6,26.8v-99.6h-37c-1.6,26.5-10.8,51.7-26.6,72.8ZM421.1,604.4h46.6c-1.7-23.2-10.7-44.4-24.8-61.2-12.8,17.9-20.4,38.9-21.8,61.2ZM421.1,620.4c1.5,22.2,9,43.3,21.8,61.2,14.1-16.8,23.1-38,24.8-61.2h-46.6ZM315,604.4h37v-99.6c-24.3,1.8-46.4,11.6-63.6,26.8,15.8,21,25,46.2,26.6,72.8ZM298.9,620.4h-46.6c1.7,23.2,10.7,44.4,24.8,61.2,12.8-18,20.4-39,21.8-61.2ZM298.9,604.4c-1.5-22.2-9-43.3-21.8-61.2-14.1,16.8-23.1,38-24.8,61.2h46.6ZM368,604.4h37c1.5-26.6,10.8-51.7,26.6-72.8-17.2-15.2-39.3-25-63.6-26.8v99.6Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BKB_small.svg
+++ b/res/pictograms/BKB_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M315,99.6c-1.5-26.6-10.8-51.7-26.6-72.8,17.2-15.2,39.3-25,63.6-26.8v99.6h-37ZM431.6,26.8c-17.2-15.2-39.3-25-63.6-26.8v99.6h37c1.6-26.5,10.8-51.7,26.6-72.8ZM298.9,115.6h-46.6c1.7,23.2,10.7,44.4,24.8,61.2,12.8-17.9,20.4-38.9,21.8-61.2ZM298.9,99.6c-1.5-22.2-9-43.3-21.8-61.2-14.1,16.8-23.1,38-24.8,61.2h46.6ZM405,115.6h-37v99.6c24.3-1.8,46.4-11.6,63.6-26.8-15.8-21-25-46.2-26.6-72.8ZM421.1,99.6h46.6c-1.7-23.2-10.7-44.3-24.8-61.1-12.8,17.9-20.4,38.9-21.8,61.1ZM421.1,115.6c1.5,22.2,9,43.3,21.8,61.2,14.1-16.8,23.1-38,24.8-61.2,0,0-46.6,0-46.6,0ZM352,115.6h-37c-1.5,26.6-10.8,51.7-26.6,72.8,17.2,15.2,39.3,25,63.6,26.8v-99.6ZM368,620.4v99.6c24.3-1.8,46.4-11.6,63.6-26.8-15.8-21.1-25-46.2-26.6-72.8h-37ZM288.4,693.2c17.2,15.2,39.3,25,63.6,26.8v-99.6h-37c-1.6,26.5-10.8,51.7-26.6,72.8ZM421.1,604.4h46.6c-1.7-23.2-10.7-44.4-24.8-61.2-12.8,17.9-20.4,38.9-21.8,61.2ZM421.1,620.4c1.5,22.2,9,43.3,21.8,61.2,14.1-16.8,23.1-38,24.8-61.2h-46.6ZM315,604.4h37v-99.6c-24.3,1.8-46.4,11.6-63.6,26.8,15.8,21,25,46.2,26.6,72.8ZM298.9,620.4h-46.6c1.7,23.2,10.7,44.4,24.8,61.2,12.8-18,20.4-39,21.8-61.2ZM298.9,604.4c-1.5-22.2-9-43.3-21.8-61.2-14.1,16.8-23.1,38-24.8,61.2h46.6ZM368,604.4h37c1.5-26.6,10.8-51.7,26.6-72.8-17.2-15.2-39.3-25-63.6-26.8v99.6ZM673.9,480.1l-91.2,91.2,71,71-11.3,11.3-282.4-282.3-91.2,91.2h0l-191.3,191.2-11.3-11.3,142.4-142.4c-55.1,18.8-118.7,6.3-162.5-37.5-61.4-61.4-61.4-161.3,0-222.6l91.2-91.2-71-71,11.3-11.3,282.4,282.3L642.5,66.3l11.3,11.3-142.4,142.4c55.1-18.8,118.7-6.3,162.5,37.5,61.4,61.4,61.4,161.2,0,222.6ZM199.3,210.7l-100.2,100.3,98.6,98.6,100.3-100.3-98.7-98.6ZM106.9,332.9c-18.1,19-17.8,49.2.9,67.9,18.7,18.7,48.9,18.9,67.9.9l-68.8-68.8ZM348.7,360l-43.7-43.6-107.3,107.3-14.9-14.9c-23,22-59.5,21.7-82.1-.9s-22.9-59.1-.9-82.1l-14.9-14.8,107.4-107.3-43.8-43.7-91.2,91.2c-55.2,55.1-55.2,144.9,0,200,55.2,55.1,144.9,55.1,200,0l91.4-91.2ZM520.7,509.3l100.2-100.3-98.6-98.6-100.3,100.3,98.7,98.6ZM613.1,387.1c18.1-19,17.8-49.2-.9-67.9-18.7-18.7-48.9-18.9-67.9-.9l68.8,68.8ZM371.3,360l43.7,43.6,107.4-107.3,14.9,14.9c23-22,59.5-21.7,82.1.9s22.9,59.1.9,82.1l14.9,14.9-107.5,107.3,43.7,43.7,91.2-91.2c55.2-55.1,55.2-144.9,0-200s-144.9-55.1-200.1,0l-91.2,91.1Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BKG_small.svg
+++ b/res/pictograms/BKG_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M93,601.5C22.8,523.9-7.7,423.2,1.6,325.5l10,1c-9.1,94.8,20.4,192.6,88.5,268l-7.1,7ZM402.3,639.7c.5-1.7,1.8-3,3.5-3.5,4.8-1.3,10.6-4.3,11.5-6.5.1-.2.2-.6-.6-1.7-5.3-7.6-29.8-34.9-56-60.2-44.6-43.1-60.4-48.8-65.1-49.2h-.5c.1,1.2.6,2.4,1.3,3.5,3.2,4.9,9.5,15.6,19.9,37.7,2.9,6.1,5.7,13.6,8.4,21.8h12.5c2.8,0,5,2.2,5,5s-2.2,5-5,5h-9.3c.9,2.9,1.7,5.8,2.6,8.8h14.8c2.8,0,5,2.2,5,5s-2.2,5-5,5h-12.1c.8,2.9,1.5,5.9,2.3,8.8h17.8c2.8,0,5,2.2,5,5s-2.2,5-5,5h-15.4c.7,3,1.4,5.9,2.1,8.8h21.4c2.8,0,5,2.2,5,5s-2.2,5-5,5h-19.1c2.4,10.8,4.1,19.7,5.1,24.7.5,2.3,3.2,3.4,5.1,2,5.9-4.2,7.9-10.3,7.9-10.3,0,0,23-4.9,38.8,12.7,15.7,17.7,4.3,41.3,4.3,41.3,1.7,1.1,3.7,1.7,5.6,1.7s5.3-1,7.2-3c9.4-9.3,18.1-15.2,23.5-18.4-1.3-6-7.4-23.5-36.2-54.1-1.3-1.4-1.8-3.2-1.3-4.9ZM399.5,216.7c9.7,2.4,16.4-1.5,20.8-5.9-33-8.4-116.4-100.5-125.3-113.1-3.1-4.5-2.7-8.4-1.7-10.9,1.7-4.7,6.5-8,10.9-10-23.3-25.8-30.7-42.5-33.1-51.2-4.7,1.5-12.9,4.1-20.3,6.4-3.7,1.1-6.7,4-7.8,7.7-8.9,30.2,40.9,73.2,69.5,103.9,40.5,40.2,68.1,68.4,87,73.1ZM317.7,80.3c-.5,1.7-1.8,3-3.5,3.5-4.8,1.3-10.6,4.3-11.5,6.5-.1.2-.2.6.6,1.7,5.3,7.6,29.8,34.9,56,60.2,44.6,43.1,60.4,48.8,65.1,49.2h.5c-.1-1.2-.6-2.4-1.3-3.5-3.2-4.9-9.5-15.6-19.9-37.7-2.9-6.1-5.7-13.6-8.4-21.8h-12.5c-2.8,0-5-2.2-5-5s2.2-5,5-5h9.3c-.9-2.9-1.7-5.8-2.6-8.8h-14.8c-2.8,0-5-2.2-5-5s2.2-5,5-5h12.1c-.8-2.9-1.5-5.9-2.3-8.8h-17.8c-2.8,0-5-2.2-5-5s2.2-5,5-5h15.4c-.7-3-1.4-5.9-2.1-8.8h-21.4c-2.8,0-5-2.2-5-5s2.2-5,5-5h19.1c-2.4-10.8-4.1-19.7-5.1-24.7-.5-2.3-3.2-3.4-5.1-2-5.9,4.2-7.9,10.3-7.9,10.3,0,0-23,4.9-38.8-12.7s-4.3-41.3-4.3-41.3c-1.6-1-3.5-1.6-5.5-1.6s-5.3,1-7.2,3c-9.4,9.3-18.1,15.2-23.5,18.4,1.3,6,7.4,23.5,36.2,54.1,1.2,1.3,1.7,3.1,1.2,4.8ZM601.7,590.3l51.9,52-11.3,11.3-52-52c-28,26.7-60.7,48.7-96.6,64.4-.7-5.1-2.3-10.3-4.5-15.5,33.3-14.9,63.7-35.4,89.8-60.2l-66.4-66.3c-25.2,23.5-54.5,40.1-85.5,49.8-2.7-2.8-5.3-5.5-7.7-8.1,31.2-9,60.8-25.2,86.1-48.8l-134-134.1c-7.2,3.6-15.7,3.6-22.9,0l-134.2,134.1c25.6,23.7,55.5,40.1,87.1,49l.3.6c1.5,3.2,3,6.9,4.6,11-36-8.8-70.2-26.7-99.1-53.6l-66.3,66.4c50.7,48.2,117.1,79.9,190.8,86.4.4,2.3,1.9,9.6,7.7,16.6-81.1-4.9-154.5-39-209.8-91.7l-52,52-11.3-11.3,270.9-270.9c-3.6-7.2-3.6-15.7,0-22.9l-27-27c-15.2,19.7-17.3,46.2-6,67.7l-27.8,29c-20.2-29-23.7-66.1-10.3-97.8l-9.2-3.9c-14.9,35.4-10.8,76.9,12.3,108.9l-12.8,12.8c-24.2-32-31.7-72.7-22.3-110.1l-9.7-2.4c-10.2,40.7-2,85,24.8,119.7l-12.8,12.8c-26.2-32.9-37.4-73.7-33.6-113.4l-10-1c-4.1,42.6,8.1,86.4,36.4,121.5l-12.8,12.8c-44.8-54.3-54-128-27.8-190.3l-9.2-3.9c-27.8,66-17.8,144,29.9,201.3l-12.9,12.8c-60.2-71.2-66.6-172.3-19-249.8l-8.5-5.2c-49.9,81.3-43.1,187.6,20.5,262.1l-12.8,12.8c-57.1-66.2-72.5-155.8-46.2-234.7l-9.5-3.2c-27.5,82.3-11.2,176,48.6,244.9l-12.8,12.8c-60.1-68.6-79.7-160.2-58.6-243.8l-9.7-2.4c-21.9,86.9-1.4,182.2,61.2,253.3l-12.7,12.7c-77.8-87.7-95.1-210.1-51.7-313.2l-9.2-3.9c-45,106.8-27,233.6,53.8,324.2l-18.4,18.4C-4.6,453.9-2.3,256.2,118.2,129.7l-51.9-52,11.3-11.3,52,52c28-26.7,60.7-48.6,96.6-64.4.7,5.1,2.3,10.3,4.5,15.5-33.3,14.9-63.7,35.4-89.8,60.2l66.4,66.4c25.2-23.5,54.5-40.1,85.5-49.8,2.7,2.8,5.3,5.5,7.7,8.1-31.2,9-60.8,25.2-86.1,48.7l134.1,134.1c7.2-3.6,15.7-3.6,22.9,0l134.1-134.1c-25.6-23.7-55.5-40.1-87.1-49-.1-.2-.2-.4-.3-.7-1.5-3.2-3-6.9-4.6-11,36,8.8,70.2,26.7,99.1,53.6l66.4-66.4c-50.7-48.2-117.1-79.9-190.8-86.4-.4-2.3-1.9-9.6-7.7-16.6,81.1,4.9,154.5,39,209.8,91.7l52-52,11.3,11.3-270.8,270.9c3.6,7.2,3.6,15.7,0,22.9l27,27c15.2-19.6,17.3-46.1,6.1-67.5l27.8-29.2c20.2,29,23.7,66.1,10.3,97.8l9.2,3.9c14.9-35.4,10.8-76.9-12.3-108.9l12.8-12.8c24.2,32,31.7,72.7,22.3,110.1l9.7,2.4c10.2-40.7,2-85-24.8-119.7l12.8-12.8c26.2,32.9,37.4,73.7,33.6,113.4l10,1c4.1-42.6-8.1-86.4-36.4-121.5l12.8-12.8c44.8,54.3,54,128,27.8,190.3l9.2,3.9c27.8-66,17.8-144-29.9-201.3l12.7-12.7c60.2,71.2,66.6,172.3,19,249.8l8.5,5.2c49.9-81.3,43.1-187.6-20.5-262.1l12.8-12.8c57.1,66.2,72.5,155.8,46.2,234.7l9.5,3.2c27.5-82.3,11.2-176-48.6-244.9l12.8-12.8c60.1,68.6,79.7,160.2,58.6,243.8l9.7,2.4c21.9-86.9,1.4-182.2-61.2-253.3l12.7-12.7c77.8,87.7,95.1,210.1,51.7,313.2l9.2,3.9c44.9-106.7,26.9-233.5-53.8-324.2l18.4-18.4c116.1,129.1,113.8,326.8-6.8,453.3ZM375.5,360c0-8.6-6.9-15.5-15.5-15.5s-15.5,6.9-15.5,15.5,6.9,15.5,15.5,15.5,15.5-6.9,15.5-15.5ZM627,118.5l-7.1,7.1c68.1,75.4,97.6,173.2,88.5,268l10,1c9.3-97.8-21.2-198.5-91.4-276.1ZM320.5,503.3c-9.7-2.4-16.4,1.5-20.8,5.9,33.1,8.4,116.4,100.5,125.3,113.1,3.1,4.5,2.7,8.4,1.7,10.9-1.7,4.7-6.5,8-10.9,10,23.3,25.8,30.7,42.5,33.1,51.2,4.7-1.5,12.9-4.1,20.3-6.4,3.7-1.1,6.7-4,7.8-7.7,8.9-30.2-40.9-73.2-69.5-103.9-40.5-40.2-68.1-68.4-87-73.1Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BMF_small.svg
+++ b/res/pictograms/BMF_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M528,516.4l125.9,126-11.3,11.3-125.9-126-14-14,11.3-11.3,14,14ZM555.6,397.8l3.3,9.4c43.1-15.1,75.3-52.2,84-96.9l-9.8-1.9c-8.1,41.2-37.8,75.5-77.5,89.4ZM447.9,589.2c8.8,16.1,13.2,39.9,1,65.7h-10.6c-2.8,0-5,2.2-5,5s2.2,5,5,5h5.1c-2.6,4.1-5.7,8.3-9.3,12.5.3-1.6-.2-3.2-1.4-4.4-1-.9-2.2-1.4-3.5-1.4s-2.6.5-3.6,1.5l-11.2,11.6c-1.9,2-1.9,5.1.1,7.1s2.3,1.4,3.6,1.4c-3.9,3.3-8,6.5-12.6,9.8,0,0-.1,0-.1,0v-5.1c0-2.8-2.2-5-5-5s-5,2.2-5,5v11.4c-30.2,17.1-55.1,11.6-77.3-2.3l3.3-3.9c1.8-2.1,1.5-5.3-.6-7-2.1-1.8-5.3-1.5-7,.6l-4,4.7c-5.6-4.1-11.1-8.6-16.4-13.4l36.5-43.2c8.6-10.5-4.2-15.6-4.8-20.5-.6-5.3,1.3-9.3,3.9-12.2v-48l-20.3-36.6,8.7-4.9,19.5,35.1h44.2c7.8-5.7,19-9.7,27.2-6-.1.1,25.4,11.4,39.6,37.4ZM372.1,567.9h-33.3v38.4l19.4,5.4c9.8,2.6,18.9,3.7,23.9-3.6,4.3-6.4,6.6-10.6,8.7-16.8,3.9-11.4-14.4-20.5-18.7-23.4ZM424.7,580.7c-2.1-1.8-5.3-1.5-7,.6l-11.8,14c-1.8,2.1-1.5,5.3.6,7,2.1,1.8,5.3,1.5,7-.6l11.8-14c1.7-2.1,1.5-5.3-.6-7ZM653.9,77.5l-11.3-11.3-111.2,111.3c6.2.9,12.4,2.3,18.4,4.2l104.1-104.2ZM273,130.8c-8.8-16.1-13.2-39.9-1-65.7h10.6c2.8,0,5-2.2,5-5s-2.2-5-5-5h-5.1c2.6-4.1,5.7-8.3,9.3-12.5-.3,1.6.2,3.2,1.4,4.4,1,.9,2.2,1.4,3.5,1.4s2.6-.5,3.6-1.5l11.2-11.6c1.9-2,1.9-5.1-.1-7.1s-2.3-1.4-3.6-1.4c3.9-3.3,8-6.5,12.6-9.8,0,0,.1,0,.1-.1v5.1c0,2.8,2.2,5,5,5s5-2.2,5-5v-11.3c30.3-17.2,55.2-11.6,77.5,2.3l-3.3,3.9c-1.8,2.1-1.5,5.3.6,7,2.1,1.8,5.3,1.5,7-.6l4-4.7c5.6,4.1,11.1,8.6,16.4,13.4l-36.5,43.2c-8.6,10.5,4.2,15.6,4.8,20.5.6,5.3-1.3,9.3-3.9,12.2v48l20.3,36.6-8.7,4.9-19.5-35.1h-44.3c-7.8,5.7-19,9.7-27.2,6,0-.2-25.5-11.5-39.7-37.5ZM348.8,152.1h33.3v-38.4l-19.4-5.4c-9.8-2.6-18.9-3.7-23.9,3.6-4.3,6.4-6.6,10.6-8.7,16.8-3.9,11.4,14.4,20.5,18.7,23.4ZM296.2,139.3c2.1,1.8,5.3,1.5,7-.6l11.8-14c1.8-2.1,1.5-5.3-.6-7-2.1-1.8-5.3-1.5-7,.6l-11.8,14c-1.7,2.1-1.5,5.3.6,7ZM280,530.7l-84.3-152.1-14,7.8,32.3,58.2c-2,.8-4.1,1.6-6.3,2.2-35.4,10.5-72.7-9.8-83.2-45.3-10.5-35.4,9.8-72.8,45.2-83.3,35.4-10.5,72.7,9.8,83.2,45.3,7.3,24.8-.4,50.6-17.9,67.4l15.9,28.6c30.2-24.4,44.4-65.5,32.7-105.1-15.5-52.4-70.5-82.4-122.9-66.9-52.4,15.5-82.3,70.6-66.8,123s70.5,82.4,122.9,66.9c4.4-1.3,8.7-2.9,12.8-4.8l28.7,51.8-23.2,12.9,35.1,63.4,14-7.8-27.4-49.4,23.2-12.8ZM494.6,437.3c-.6,3-2.9,5.5-5.9,6.4l-79.7,23.6c-5.1,1.5-10.4-1.4-11.9-6.5-1.2-4,.3-8.2,3.7-10.6l26-18.1-12.2-22.1-146.2,81.2-11.7-21.1,111.3-144.2-15.4-27.8,14-7.8,14.8,26.8,132.8-39.3,8.3,12.9-43.6,50.2c16,10.9,36.6,14.7,56.5,8.8,35.4-10.5,55.7-47.8,45.2-83.3-10.5-35.4-47.8-55.7-83.2-45.3-29.4,8.7-48.4,36-47.9,65.3l-31.4,9.3c-5-46.6,23.8-91.5,70.3-105.3,52.4-15.5,107.4,14.4,122.9,66.9,15.5,52.4-14.4,107.5-66.8,123-46.5,13.8-95-8.3-116.2-50.1l31.4-9.3c2.1,3.4,4.5,6.5,7.1,9.4l25.6-29.5-103.1,30.5,29.8,53.9,20-23c3.8,3.8,7.8,7.3,12.1,10.5l-23.8,27.5,12.6,22.7,1-.7c3.3-2.3,6.9-4,10.6-5.1,11.6-3.4,24.5-1,34.2,7l5.9,5c2.4,2,3.5,5.1,2.9,8.2ZM406.8,396l-30.4-54.9-97,125.8,127.4-70.9ZM291.4,322.5l8.6-5.1c-16-27.3-41.3-47.8-71.2-57.6l-3.1,9.5c27.6,9.1,51,28,65.7,53.2ZM218.2,206.3L78.3,66.3l-11.3,11.3,139.9,140,11.3-11.3ZM68.1,641.7l11.3,11.3,125.9-126-11.3-11.3-125.9,126Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BMX_small.svg
+++ b/res/pictograms/BMX_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M186.1,522.4l11.3,11.3-120.1,120-11.3-11.3,120.1-120ZM522.6,533.7l120.1,120,11.3-11.3-120.1-120-11.3,11.3ZM654,77.7l-11.3-11.3-71.5,71.4,11.3,11.3,71.5-71.4ZM197.5,186.3l-120.2-120-11.3,11.4,120.1,120,11.4-11.4ZM251.1,256.2c-1.7-2.6-1.9-5.9-.4-8.6,1.5-2.7,4.3-4.4,7.4-4.4h83.3c5.3,0,9.6,4.3,9.6,9.6s-2.6,7.8-6.5,9.1l-30.1,10,5.5,24.7,163.5-36.4,5.3,23.6-148,106.6,6.9,31-15.6,3.5-6.6-29.9h-138.8l-4.3-14.7,56.1-35.8c-12.3-15-31-24.5-51.8-24.5-37,0-67.1,30.1-67.1,67s30.1,67,67.1,67,56.7-20.8,64.6-49h32.9c-8.5,46.1-48.9,81-97.5,81s-99.1-44.3-99.1-99,44.4-99,99.1-99,89,34.9,97.5,81h-32.9c-1.1-3.8-2.5-7.5-4.2-11l-33,21h107.7l-13.4-60.1-25.8,16.4c-2.5-4.7-5.4-9.2-8.7-13.5l30.7-19.6-5.6-25.4-1.1.4c-3.8,1.3-7.8,1.9-11.7,1.9-12.1,0-23.9-6-30.9-16.5l-4.1-6.4ZM323.3,312.1l13.6,61.3,128.9-93.1-142.5,31.8ZM352.5,594.2l-15.7-18c-11.7,12.3-20.5,27.3-25.6,43.9h36.3l6.7-14c1.8-3.9,1.2-8.6-1.7-11.9ZM307.5,538.4s-5.4,10.9,2.3,25.7h29.8l20.5,23.5c5.5,6.3,6.7,15.2,3.1,22.8l-3,6.3,94.2,53.3c5.4-9.3,9.8-21,11.4-36.3l-116.4-116.3-41.9,21ZM308.7,630.1h0s-2.6,11.9-2.3,22.6h-34.8l-23.2,12.4,58,19.8c15,5.1,29.7,11.1,43.8,18.1,13.6,6.7,36.7,15.6,65.8,17.1,2.2-7.6,6.7-14.2,13.6-21,4.4-4.4,10-9.4,15.6-15.9l-93.7-53h-42.8ZM521.2,388.7l15.6-3.5-14.5-64.9c2.2-.2,4.4-.3,6.6-.3,37,0,67.1,30.1,67.1,67s-30,67-67,67-67.1-30.1-67.1-67,14.8-48.4,36.4-59.6l-7.1-32c-36,14.9-61.3,50.2-61.3,91.5s44.4,99,99.1,99,99.1-44.3,99.1-99-44.4-99-99.1-99-9.2.4-13.6,1l-12.9-57.9,26-5.8-24.6-110.2-15.6,3.5,21.1,94.5-26,5.8,37.8,169.9ZM412.6,181.6s5.4-10.9-2.3-25.7h-29.8l-20.5-23.5c-5.5-6.3-6.7-15.2-3.1-22.8l3-6.3-94.2-53.3c-5.4,9.3-9.8,21-11.4,36.3l116.4,116.2,41.9-20.9ZM367.5,125.8l15.7,18c11.7-12.3,20.5-27.3,25.6-43.9h-36.3l-6.7,14c-1.8,3.9-1.1,8.6,1.7,11.9ZM411.4,89.9h0s2.6-11.9,2.3-22.6h34.8l23.2-12.4-58-19.8c-15-5.1-29.7-11.1-43.8-18.1-13.6-6.7-36.7-15.6-65.8-17-2.2,7.6-6.7,14.2-13.6,21-4.4,4.4-10,9.4-15.6,15.9l93.7,53h42.8Z"/>
-  </g>
-</svg>
--- a/res/pictograms/BOX_small.svg
+++ b/res/pictograms/BOX_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M429.6,175c23.8-23.8,52.8-7.2,75.1-30.6,6.7-6.7,17.6-6.6,24.3.1l45.4,45.4c6.8,6.8,6.8,17.7,0,24.5l-40.5,40.6c-.3-.4-33.7-33.5-34-34-16.9-16.9-45-17.6-61.3,0-6.8,7.3-18.6,13.2-27.9,5.8-8.7-6.6-14.6-18.8-5.5-27.7,10.4-10.3,24.3-23.9,24.4-24.1ZM445.4,229.8c-14.1,14.5-32.8,16-46.4-.3-26.1,21.6-29.7,61.4-5.2,85.6,28.2,33.1,65,58.6,103.7,23.3,19.6-20.1,56-45.6,28.2-75.5-21-19.5-50.1-64.2-80.3-33.1ZM557,523l163-163-138.5-138.5-11.3,11.3,119.2,119.2h-35.7l-80.3-80.3-7.1,7.1,73.3,73.3h-35.7l-30.4-30.4-7.1,7.1,31.4,31.4-31.4,31.4,7.1,7.1,30.4-30.5h35.7l-73.3,73.3,7.1,7.1,80.3-80.3h35.7l-143.7,143.4,11.3,11.3ZM584.8,186.2l49.1-49.1-52.7-51.3-48.4,48.4c.1,0,51.9,51.9,52,52ZM352,30.6v35.7l-80.3,80.3,7.1,7.1,73.2-73.2v35.7l-30.4,30.4,7.1,7.1,31.4-31.4,31.4,31.4,7.1-7.1-30.6-30.3v-35.8l73.3,73.3,7.1-7.1-80.4-80.3V30.6l115.7,115.7c5-1.7,9.5-4.3,13.8-8.8h0L360,0l-163,163,11.3,11.3L352,30.6ZM66.3,77.7l576,576,11.3-11.3L77.6,66.4l-11.3,11.3ZM274.6,490.2c14.1-14.5,32.8-16,46.4.3,26.1-21.6,29.7-61.4,5.2-85.6-28.2-33.1-65-58.6-103.7-23.3-19.6,20.1-56,45.6-28.2,75.5,21,19.5,50.1,64.2,80.3,33.1ZM368,689.4v-35.7l80.3-80.3-7.1-7.1-73.2,73.2v-35.7l30.4-30.4-7.1-7.1-31.3,31.3-31.4-31.4-7.1,7.1,30.5,30.4v35.7l-73.3-73.3-7.1,7.1,80.3,80.3v35.7l-115.6-115.5c-5,1.7-9.5,4.3-13.8,8.8h0l137.5,137.5,163-163-11.3-11.3-143.7,143.7ZM163,197L0,360l138.5,138.5,11.3-11.3-119.2-119.2h35.7l80.3,80.3,7.1-7.1-73.2-73.2h35.7l30.4,30.4,7.1-7.1-31.3-31.3,31.4-31.4-7.1-7.1-30.4,30.5h-35.8l73.3-73.3-7.1-7.1-80.3,80.4H30.6l143.7-143.7-11.3-11.3ZM135.2,533.8l-49.1,49.1,52.7,51.3,48.4-48.4c-.1,0-51.9-51.9-52-52ZM314.7,520.9c9.2-8.9,3.3-21.1-5.5-27.7-9.3-7.5-21.1-1.6-27.9,5.8-16.3,17.5-44.4,16.9-61.3,0-.3-.4-33.6-33.5-34-34l-40.5,40.5c-6.8,6.8-6.8,17.7,0,24.5l45.4,45.4c6.7,6.7,17.6,6.9,24.3,0,22.3-23.4,51.2-6.8,75.1-30.6.2-.1,14.1-13.7,24.4-24Z"/>
-  </g>
-</svg>
--- a/res/pictograms/CER_small.svg
+++ b/res/pictograms/CER_small.svg
@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 720 720" style="enable-background:new 0 0 720 720;" xml:space="preserve">
-<path d="M384.4,346.2h-16.3c-4.1,0-7.6,3.4-7.6,7.6v65c0,4.1,3.4,7.6,7.6,7.6h16.3c4.1,0,7.6-3.3,7.6-7.6v-65
-	C392,349.6,388.7,346.2,384.4,346.2z"/>
-<path d="M385.5,487.7h-18.1c-3.7,0-6.5,2.9-6.5,6.5v98.5c0,3.7,2.9,6.5,6.5,6.5h18.1c3.7,0,6.5-2.9,6.5-6.5v-98.5
-	C392,490.6,389.2,487.7,385.5,487.7z"/>
-<path d="M426.3,250.3l85.5-95.6c2.6-2.9,2.3-7.2-0.6-9.7l-13.1-11.7c-2.9-2.6-7.2-2.3-9.7,0.6l-85.5,95.6c-2.6,2.9-2.3,7.2,0.6,9.7
-	l13.1,11.7C419.4,253.5,423.8,253.2,426.3,250.3z"/>
-<path d="M330.2,320.9c-2.9-2.6-7.2-2.3-9.7,0.6L235,417.1c-2.6,2.9-2.3,7.2,0.6,9.7l13.1,11.7c2.9,2.6,7.2,2.3,9.7-0.6l85.5-95.6
-	c2.6-2.9,2.3-7.2-0.6-9.7L330.2,320.9z"/>
-<path d="M429.9,315.6c-2.9-2.6-7.2-2.3-9.7,0.6l-11.7,13.1c-2.6,2.9-2.3,7.2,0.6,9.7l95.6,85.5c2.9,2.6,7.2,2.3,9.7-0.6l11.7-13.1
-	c2.6-2.9,2.3-7.2-0.5-9.7L429.9,315.6z"/>
-<path d="M316.9,256.4c2.9,2.6,7.2,2.3,9.7-0.6l11.7-13.1c2.6-2.9,2.3-7.2-0.6-9.7l-95.6-85.5c-2.9-2.6-7.2-2.3-9.7,0.6l-11.7,13.1
-	c-2.6,2.9-2.3,7.2,0.6,9.7L316.9,256.4z"/>
-<path d="M527,267.5L433,268c-3.8,0-6.8,3.2-6.8,7l0.2,17.5c0,3.8,3.2,6.8,7,6.8l94.1-0.5c3.8,0,6.9-3.2,6.9-7l-0.2-17.5
-	C533.9,270.6,530.8,267.5,527,267.5z"/>
-<path d="M316.3,292.9v-17.5c0-3.8-3.2-6.8-7-6.8l-86,0.3c-3.8,0-6.8,3.2-6.8,7l0.2,17.5c0,3.8,3.2,6.8,7,6.8l86-0.3
-	C313.2,299.9,316.3,296.7,316.3,292.9z"/>
-<path d="M378.8,229c4.3,0,7.8-3.5,7.8-7.8l-0.5-92.1c0-4.3-3.5-7.8-7.8-7.8h-15.8c-4.3,0-7.8,3.5-7.8,7.8l0.5,92.1
-	c0,4.3,3.5,7.8,7.8,7.8H378.8z"/>
-<path d="M640.2,505.3h-8.1c-2.9,0-5.2,2.3-5.2,5.2v32.4c0,2.9,2.3,5.2,5.2,5.2h8.1c2.9,0,5.2-2.3,5.2-5.2v-32.4
-	C645.4,507.5,643.1,505.3,640.2,505.3z"/>
-<path d="M662,461.4c0.2,0,0.2,0,0.3,0c1.2,0,2.1-0.6,2.9-1.4l42.2-47c0.8-0.9,1.2-2,1.1-3c0-1.2-0.6-2.1-1.4-2.9l-7.3-6.5
-	c-1.8-1.5-4.4-1.4-6.1,0.3l-42.2,47c-1.5,1.8-1.4,4.4,0.3,6.1l7.3,6.5C659.9,460.9,660.9,461.4,662,461.4z"/>
-<path d="M610.7,488.5c-0.8-0.8-2-1.1-3-1.1c-1.1,0-2.1,0.6-2.9,1.4L562.5,536c-1.5,1.7-1.4,4.4,0.3,5.9l7.3,6.5
-	c0.8,0.8,1.8,1.1,2.7,1.1c0.2,0,0.2,0,0.3,0c1.1,0,2.1-0.6,2.9-1.4l42.3-47.2c1.5-1.7,1.4-4.4-0.3-5.9L610.7,488.5z"/>
-<path d="M667,486.4c-2-1.8-5-1.7-6.8,0.3l-5.8,6.4c-1.8,2-1.7,5,0.3,6.8l46.3,41.4c0.9,0.8,2.1,1.2,3.2,1.2c1.4,0,2.7-0.6,3.7-1.7
-	l5.8-6.4c0.9-0.9,1.4-2.3,1.2-3.5c0-1.4-0.6-2.4-1.7-3.3L667,486.4z"/>
-<path d="M603,462.5c0.9,0.8,2,1.2,3.2,1.2c1.2,0,2.6-0.5,3.5-1.5l5.9-6.7c1.7-2,1.5-4.9-0.3-6.5l-46.4-41.7c-2-1.7-4.9-1.5-6.7,0.3
-	l-5.9,6.7c-0.8,0.9-1.2,2.1-1.2,3.4s0.6,2.4,1.5,3.2L603,462.5z"/>
-<path d="M599.3,481.3c0.9-0.9,1.4-2,1.4-3.2v-9.3c0-1.2-0.5-2.3-1.4-3.2c-0.9-0.9-2-1.4-3.2-1.4l-42.9,0.2c-1.2,0-2.3,0.5-3.2,1.4
-	c-0.9,0.9-1.4,2-1.4,3.2v9.3c0,2.4,2,4.6,4.6,4.6l42.9-0.2C597.3,482.7,598.4,482.3,599.3,481.3z"/>
-<path d="M720,468.9c0-1.2-0.5-2.3-1.4-3.2c-0.9-0.9-2-1.4-3.2-1.4l-42.9,0.2c-1.2,0-2.3,0.5-3.2,1.4c-0.9,0.9-1.4,2-1.4,3.2v9.3
-	c0,2.4,2,4.6,4.6,4.6l42.9-0.2c1.2,0,2.3-0.5,3.2-1.4c0.9-0.9,1.4-2,1.4-3.2V468.9z"/>
-<path d="M629.3,445.1h9c2.6,0,4.7-2.1,4.7-4.7l-0.2-46.1c0-2.6-2.1-4.7-4.7-4.7h-8.8c-2.6,0-4.7,2.1-4.7,4.7l0.2,46.1
-	C624.6,443,626.7,445.1,629.3,445.1z"/>
-<path d="M108.1,150.7c0-5.8-4.7-10.5-10.5-10.5c-5.8,0-10.5,4.7-10.5,10.5c0,5.8,4.7,10.5,10.5,10.5
-	C103.3,161.2,108.1,156.4,108.1,150.7z"/>
-<path d="M146.1,212.4c5.8,0,10.5-4.7,10.5-10.5c0-5.8-4.7-10.5-10.5-10.5c-5.8,0-10.5,4.7-10.5,10.5
-	C135.8,207.7,140.5,212.4,146.1,212.4z"/>
-<path d="M571.2,226.7c5.8,0,10.5-4.7,10.5-10.5c0-5.8-4.7-10.5-10.5-10.5s-10.5,4.7-10.5,10.5C560.7,222,565.4,226.7,571.2,226.7z"
-	/>
-<path d="M457.5,517.4c5.8,0,10.5-4.7,10.5-10.5c0-5.8-4.7-10.5-10.5-10.5c-5.8,0-10.5,4.7-10.5,10.5
-	C447,512.7,451.7,517.4,457.5,517.4z"/>
-<path d="M146.1,517.9c-5.8,0-10.5,4.7-10.5,10.5c0,5.8,4.7,10.5,10.5,10.5c5.8,0,10.5-4.7,10.5-10.5
-	C156.6,522.6,151.9,517.9,146.1,517.9z"/>
-<path d="M91.8,362.5h-8.1c-2.9,0-5.2,2.3-5.2,5.2v32.4c0,2.9,2.3,5.2,5.2,5.2h8.1c2.9,0,5.2-2.3,5.2-5.2v-32.4
-	C96.8,364.8,94.5,362.5,91.8,362.5z"/>
-<path d="M113.4,318.7c0.2,0,0.2,0,0.3,0c1.2,0,2.1-0.6,2.9-1.4l42.2-47c0.8-0.9,1.2-2,1.1-3c0-1.2-0.6-2.1-1.4-2.9l-7.3-6.5
-	c-0.9-0.8-2-1.1-3-1.1c-1.2,0-2.1,0.6-2.9,1.4l-42.2,47c-1.5,1.8-1.4,4.4,0.3,6.1l7.3,6.5C111.2,318.2,112.3,318.7,113.4,318.7z"/>
-<path d="M62.1,345.7c-1.7-1.5-4.4-1.4-5.9,0.3l-42.3,47.2c-1.5,1.7-1.4,4.4,0.3,5.9l7.3,6.5c0.8,0.8,1.8,1.1,2.7,1.1
-	c0.2,0,0.2,0,0.3,0c1.1,0,2.1-0.6,2.9-1.4l42.3-47.2c0.8-0.9,1.1-2,1.1-3s-0.6-2.1-1.4-2.9L62.1,345.7z"/>
-<path d="M118.4,343.6c-0.9-0.9-2.1-1.4-3.5-1.2c-1.4,0-2.4,0.6-3.3,1.7l-5.8,6.4c-0.9,0.9-1.4,2.3-1.2,3.5c0,1.4,0.6,2.4,1.7,3.4
-	l46.3,41.4c0.9,0.8,2,1.2,3.2,1.2c0.2,0,0.2,0,0.3,0c1.2,0,2.4-0.6,3.3-1.7l5.8-6.4c0.9-0.9,1.4-2.3,1.2-3.5c0-1.4-0.6-2.4-1.7-3.3
-	L118.4,343.6z"/>
-<path d="M54.3,319.7c0.9,0.8,2,1.2,3.2,1.2c0.2,0,0.2,0,0.3,0c1.2,0,2.4-0.6,3.2-1.5l5.9-6.7c0.8-0.9,1.2-2.1,1.2-3.3
-	c0-1.2-0.6-2.4-1.5-3.2l-46.4-41.7c-0.9-0.8-2.1-1.2-3.3-1.2s-2.4,0.6-3.2,1.5l-5.9,6.7c-1.7,2-1.5,4.9,0.3,6.5L54.3,319.7z"/>
-<path d="M172.9,322.6c-0.9-0.9-2-1.5-3.3-1.4l-46.4,0.2c-1.2,0-2.4,0.5-3.3,1.4c-0.9,0.9-1.4,2.1-1.4,3.3v9c0,1.2,0.5,2.4,1.4,3.4
-	c0.9,0.9,2.1,1.4,3.3,1.4l46.4-0.2c1.2,0,2.4-0.5,3.3-1.4c0.9-0.9,1.4-2.1,1.4-3.3v-9C174.3,324.6,173.8,323.5,172.9,322.6z"/>
-<path d="M50.7,338.6c0.9-0.9,1.4-2,1.4-3.2v-9.3c0-1.2-0.5-2.3-1.4-3.2c-0.9-0.9-2-1.4-3.2-1.4l-42.9,0.2c-1.2,0-2.3,0.5-3.2,1.4
-	c-0.9,0.9-1.4,2-1.4,3.2v9.3c0,2.4,2,4.6,4.6,4.6l42.9-0.2C48.7,340,49.8,339.5,50.7,338.6z"/>
-<path d="M80.7,302.4h9c2.6,0,4.7-2.1,4.7-4.7l-0.2-46.1c0-1.2-0.5-2.4-1.4-3.3c-0.9-0.9-2.1-1.4-3.3-1.4h-9c-1.2,0-2.4,0.5-3.3,1.4
-	c-0.9,0.9-1.4,2.1-1.4,3.3l0.2,46.1c0,1.2,0.5,2.4,1.4,3.3C78.2,301.9,79.4,302.4,80.7,302.4z"/>
-</svg>
--- a/res/pictograms/CLB_small.svg
+++ b/res/pictograms/CLB_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M88.1,225c0-7.7,6.3-14,14-14s14,6.3,14,14-6.3,14-14,14-14-6.2-14-14ZM212.1,68.3c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.3-14-14-14ZM508.9,165.2c7.7,0,14-6.3,14-14s-6.3-14-14-14-14,6.3-14,14c0,7.7,6.3,14,14,14ZM149.4,400.2v-1.3c.3-29.2-18.8-50.1-36.8-57.5-2.5-1-2-4.8.6-5.1,5.7-.7,26.2,0,33-1.3,20.2-4,34.2-18.4,38.5-34.2,4.9-18,28.3-17.7,30.8,8.4,1.8,18.7,19.6,30.4,29.4,32.1,9.6,1.7,15.5-.9,20.9-.9,8.7,0,15.6,7.8,14.7,17-.8,7.9-7.5,13.7-15.2,13.8-11.1.1-22.2-1.8-37.1-2.8-27.8-1.8-57.8,11.3-72.9,33.8-1.8,2.7-6,1.3-5.9-2ZM184.6,337.9c0,7.7,6.3,14,14,14s14-6.3,14-14-6.3-14-14-14-14,6.3-14,14ZM45.3,441.6c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.2-14-14-14ZM45.6,217.6c8-8.1,8.5-8.8,18.1-18.6,15.7-15.9,24.6-19.6,34.4-19.6s3.6.1,5.5.3c14.9,1.5,24.6,15,33.1,33,13.3,28.1-11.6,48.5-32.9,48.5s-6.6-.5-9.6-1.6c-3.3-1.2-6.3-1.6-9.3-1.6-17.2,0-29.2,17.1-42.3,17.1s-8-1.6-12.3-5.6c-16.1-15.4-7.2-29,15.3-51.9ZM32.1,253.6c0,.9,0,3.8,5.2,8.7,3,2.9,4.7,2.9,5.4,2.9,3.2,0,8.1-3.1,12.8-6.1,7.7-4.9,17.4-11,29.5-11s8.4.7,12.6,2.2c1.9.7,4,1,6.3,1,9.2,0,18.9-5.2,23.6-12.6,4-6.3,4.1-13.6.3-21.6-8.6-18-16.3-26.5-25.1-27.3-1.8-.2-3.2-.3-4.5-.3-5.8,0-12.2,1.3-27.3,16.6-4.8,4.9-7.3,7.5-9.7,9.9-2.3,2.4-4.5,4.6-8.5,8.7-10.7,10.9-20.7,22-20.6,28.9ZM226.5,188.7c7.7,0,14-6.3,14-14s-6.3-14-14-14-14,6.3-14,14,6.3,14,14,14ZM71.7,519.5c-2.4.6-4.6.9-6.6.9-12.4,0-20-11.6-53-42.7C3.7,469.8,0,461.5,0,453.6c0-24.5,33.7-46,60.6-46s31.9,9,32.5,31.9c1.2,52.2-.9,75-21.5,80ZM69.3,509.8c4.4-1.1,8.9-3.1,11.6-14.9,2.7-11.9,2.9-30.6,2.2-55.1-.4-14.9-7.7-22.2-22.5-22.2s-24.3,4.6-34.6,11.9c-10.2,7.3-16,16.1-16,24s3,11.3,8.8,16.8c8.4,7.9,15.2,14.6,20.7,20,15.1,14.8,20.6,20,25.5,20,1.2.1,2.6,0,4.3-.5ZM493.5,531.3c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.3-14-14-14ZM570.6,319.8v1.3c-.3,29.2,18.8,50.1,36.8,57.5,2.5,1,2,4.8-.6,5.1-5.7.7-26.2,0-33,1.3-20.2,4-34.2,18.4-38.5,34.2-4.9,18-28.3,17.7-30.8-8.4-1.8-18.7-19.6-30.4-29.4-32.1-9.6-1.7-15.5.9-20.9.9-8.7,0-15.6-7.8-14.7-17,.8-7.9,7.5-13.7,15.2-13.8,11.1-.1,22.2,1.8,37.1,2.8,27.8,1.8,57.8-11.3,72.9-33.8,1.8-2.7,6-1.3,5.9,2ZM535.4,382.1c0-7.7-6.3-14-14-14s-14,6.3-14,14,6.3,14,14,14,14-6.3,14-14ZM617.9,481c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.2-14-14-14ZM720,266.3c0,24.5-33.7,46-60.6,46s-31.9-9-32.5-31.9c-1.4-52.1.8-74.9,21.4-80,2.4-.6,4.6-.9,6.6-.9,12.4,0,20,11.6,53,42.7,8.6,8,12.1,16.2,12.1,24.1ZM710,266.4c0-5.7-3-11.3-8.8-16.8-8.4-7.9-15.2-14.6-20.7-20-15.1-14.8-20.6-20-25.5-20s-2.5.2-4.3.6c-4.4,1.1-8.9,3.1-11.6,14.9-2.7,11.9-2.9,30.6-2.2,55.1.4,14.9,7.7,22.2,22.5,22.2s24.3-4.6,34.6-11.9c10.2-7.4,16-16.2,16-24.1ZM371.3,360l282.3,282.3-11.3,11.3-293.1,66.4-128.5-66.3H77.7l-11.3-11.3,282.3-282.4L66.3,77.7l11.3-11.3L370.8,0l128.5,66.3h143l11.3,11.3-282.3,282.4ZM426.7,199.1l41.4,41.5,164.2-164.2h-129.7l-75.9,122.7ZM403.5,75.1c0,7.7,6.3,14,14,14s14-6.3,14-14-6.3-14-14-14-14,6.2-14,14ZM276.6,149l-155.5-39.2,131.9,131.9,23.6-6.7v-86ZM279.3,139.4L359.4,12.8,86,74.7l21.3,21.3,172,43.4ZM286.6,232.2l127.4-36-46-178.2-81.4,128.6v85.6h0ZM374.1,123.1c0,7.7-6.3,14-14.1,14s-14.1-6.3-14.1-14,6.3-14,14.1-14,14.1,6.2,14.1,14ZM345.9,596.9c0-7.7,6.3-14,14.1-14s14.1,6.3,14.1,14-6.3,14-14.1,14-14.1-6.2-14.1-14ZM360,294.6c7.7,0,14-6.3,14-14s-6.3-14-14-14-14,6.3-14,14,6.3,14,14,14ZM225.4,630.7l67.9-109.8-41.4-41.4-164.2,164.2h129.7l8-13ZM316.5,644.9c0-7.7-6.3-14-14-14s-14,6.3-14,14,6.3,14,14,14,14-6.2,14-14ZM443.4,571l155.5,39.2-131.9-131.9-23.6,6.7v86h0ZM440.7,580.6l-80.1,126.6,273.4-61.9-21.3-21.3-172-43.4ZM433.4,487.8l-127.4,36,46,178.2,81.4-128.6v-85.6h0ZM360,425.4c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.3-14-14-14ZM689.5,450.4c-4.3-4.1-8.3-5.6-12.3-5.6v10c.6,0,2.3,0,5.4,2.9,5.2,4.9,5.2,7.8,5.2,8.7,0,6.9-9.8,18-20.6,29-4,4.1-6.1,6.3-8.5,8.7-2.3,2.4-4.9,5-9.7,9.9-15,15.3-21.5,16.6-27.3,16.6s-2.7,0-4.5-.3c-8.8-.9-16.6-9.3-25.1-27.3-3.8-8-3.7-15.3.3-21.6,4.7-7.4,14.4-12.6,23.6-12.6s4.4.3,6.3,1c4.2,1.5,8.4,2.2,12.6,2.2,12.1,0,21.7-6.1,29.5-11,4.7-3,9.6-6.1,12.8-6.1v-10c-13,0-25,17.1-42.3,17.1s-6-.5-9.3-1.6c-3-1.1-6.3-1.6-9.6-1.6-21.3,0-46.3,20.4-32.9,48.5,8.6,18.1,18.3,31.5,33.1,33,1.9.2,3.7.3,5.5.3,9.8,0,18.8-3.6,34.4-19.6,9.6-9.8,10.1-10.4,18.1-18.6,22.7-22.9,31.6-36.5,15.3-52ZM674.7,250.4c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.3-14-14-14ZM211.1,554.8c-7.7,0-14,6.3-14,14s6.3,14,14,14,14-6.3,14-14-6.3-14-14-14ZM507.9,651.7c7.7,0,14-6.3,14-14s-6.3-14-14-14-14,6.3-14,14c0,7.7,6.3,14,14,14Z"/>
-  </g>
-</svg>
--- a/res/pictograms/CRD_small.svg
+++ b/res/pictograms/CRD_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M104.9,281.1c1.8,0,3.6-.1,5.4-.2L7.1,384l-7.1-7,96.4-96.4c2.8.3,5.6.5,8.5.5ZM74.9,274c-3.1-1.5-6-3.3-8.8-5.3L0,334.8l7.1,7.1,67.8-67.9ZM419.2,0L0,419.2l11.3,11.3L430.5,11.3l-11.3-11.3ZM375.4,206.1l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM276.7,304.9l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM712.9,378.2l-67.8,67.8c3.1,1.5,6,3.3,8.8,5.3l66.1-66.1-7.1-7ZM227.3,354.3l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM609.7,439.1c1.8-.1,3.6-.2,5.4-.2,2.8,0,5.7.2,8.4.5l96.5-96.4-7.1-7.1-103.2,103.2ZM675.9,598.4c.5,1.6,0,3.4-1.1,4.6l-24.1,24.5c-2,2-5.2,2-7.2,0-1.6-1.5-2-3.9-1-5.8l4.8-9.9-32.8-18.4-51.3,51.3-29.2-14.1c0-1,.2-2,.2-3,0-22.6-18.3-40.9-40.9-40.9s-40.9,18.3-40.9,40.9,18.3,40.9,40.9,40.9,27.1-7.5,34.3-18.8l-36.5-17.6,4.4-9,77.2,37.3c2.9,1.4,4.8,4.1,5.3,7.2.5,3.1-.5,6.3-2.7,8.5l-13.6,13.6c-2.4,2.4-5.8,3.4-9.1,2.6-3.3-.8-5.9-3.2-7-6.4l-4.2-12.5,9.5-3.2,4.1,12.1,13.1-13.1-25.9-12.5c-9.9,16.6-28.1,27.7-48.8,27.7-31.4,0-56.9-25.5-56.9-56.9s25.5-56.9,56.9-56.9,51.9,20.8,56.2,48l11.7-55.2-21.3-11.9,4.9-8.7,51,28.5,14.6-66.7,9.8,2.1-15.2,69.7,47.1,26.3c2.9-5.3,8.4-8.5,14.4-8.5s2,0,3.1.3l3.1.6c1.2.4,2.6,1.6,3.1,3.2ZM605.4,588.4l-35.2-19.7-14.7,69.6,49.9-49.9ZM621.6,546.1l-3.6,16.5c30.1-1.5,54-26.4,54-56.8s-25.5-56.9-56.9-56.9-56.9,25.5-56.9,56.9,12.4,40.9,30.5,50.4l3.6-16.4c-10.9-7.3-18.1-19.8-18.1-34,0-22.6,18.3-40.9,40.9-40.9s40.9,18.3,40.9,40.9-14.9,37.2-34.4,40.3ZM424.8,156.8l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM502.5,79.1l-7.1-7.1-28.3,28.3,7.1,7.1,28.3-28.3ZM326.1,255.5l28.3-28.3-7.1-7.1-28.3,28.4,7.1,7ZM422.1,450.4l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM217.5,640.9l7.1,7.1,28.3-28.3-7.1-7.1-28.3,28.3ZM372.7,499.8l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM323.3,549.2l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM295.2,563.2l-28.3,28.3,7.1,7.1,28.3-28.3-7.1-7.1ZM708.7,289.5l-419.2,419.2,11.3,11.3,419.2-419.2-11.3-11.3ZM177.9,403.7l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM642.3,66.3L66.3,642.3l11.3,11.3L653.6,77.6l-11.3-11.3ZM79.1,502.5l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM471.5,401l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM128.5,453.1l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM520.9,351.6l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM619.7,252.8l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM570.3,302.2l28.3-28.3-7.1-7.1-28.3,28.3,7.1,7.1ZM161.8,214.2c0-21.9-12.4-40.9-30.5-50.4l-3.6,16.4c10.9,7.3,18.1,19.8,18.1,34,0,22.6-18.3,40.9-40.9,40.9s-40.9-18.3-40.9-40.9,14.9-37.2,34.4-40.3l3.6-16.5c-30.1,1.5-54,26.4-54,56.8s25.5,56.9,56.9,56.9,56.9-25.5,56.9-56.9ZM44.1,121.6c-.5-1.6,0-3.4,1.1-4.6l24.1-24.5c2-2,5.2-2,7.2,0,1.6,1.5,2,3.9,1,5.8l-4.8,9.9,32.8,18.4,51.3-51.3,29.2,14.1c-.1,1-.2,2-.2,3,0,22.6,18.3,40.9,40.9,40.9s40.9-18.3,40.9-40.9-18.3-40.9-40.9-40.9-27.1,7.5-34.3,18.8l36.5,17.6-4.4,9-77.2-37.3c-2.9-1.4-4.8-4.1-5.3-7.2s.5-6.3,2.7-8.5l13.6-13.6c2.4-2.4,5.8-3.4,9.1-2.6s5.9,3.2,7,6.4l4.2,12.5-9.5,3.2-4.1-12.1-13.1,13.1,25.9,12.5c9.9-16.6,28.1-27.7,48.8-27.7,31.4,0,56.9,25.5,56.9,56.9s-25.5,56.9-56.9,56.9-51.9-20.8-56.2-48l-11.7,55.2,21.3,11.9-4.9,8.7-51-28.5-14.6,66.7-9.8-2.1,15.2-69.7-47.1-26.3c-2.9,5.3-8.4,8.5-14.4,8.5s-2,0-3.1-.3l-3.1-.6c-1.2-.4-2.6-1.6-3.1-3.2ZM114.6,131.6l35.2,19.7,14.7-69.6-49.9,49.9Z"/>
-  </g>
-</svg>
--- a/res/pictograms/CSL_small.svg
+++ b/res/pictograms/CSL_small.svg
--- a/res/pictograms/CSP_small.svg
+++ b/res/pictograms/CSP_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M642.8,71.8l-274.8,234.4v-121.2l10.5-26.2c16.3-40.6,21.2-95.4,12.1-133.1-1.6-6.6-6.2-16.9-9.3-21.8-2-3.2-5.8-4.6-9.5-3.5-7.6,2.2-37.8,32.1-37.8,59.6v36.3c0,22.9,3.7,45.5,10.9,67.2l7.1,21.3v135.3c-3.7,3.2-7.3,6.5-10.9,9.7l-29.9-29.9,30.8-30.8v-14.1l-37.8,37.8-31-31,68.8-68.8v-6.6l-1.9-5.6-74.1,74.1-31-31,91.8-91.8c-.7-4.2-1.2-8.3-1.6-12.5l-97.2,97-31-31,127-127.1c.3-11.5,4.9-23.3,11.1-33.8l-149.4,149.6-108-108-11.4,11.3,108,108L0,360l11.3,11.3,174.4-174.3,31,31-132,132,7.1,7.1,132-132,31,31-94,93.9,7.1,7.1,93.9-93.9,31,31-55.8,55.8,7.1,7.1,55.8-55.8,29.3,29.3c-25.5,23.4-50.2,47.7-73.9,72.9-35.2,37.4-68.4,76.7-99.4,117.8l-84.2,111.7c-1.3,1.8-.9,3.8.4,5,1.2,1.2,3.3,1.7,5,.4l111.7-84.4c41.1-31,80.4-64.2,117.8-99.4,15.5-14.6,30.7-29.5,45.5-44.8v115.4l-7.1,21.3c-7.2,21.7-10.9,44.3-10.9,67.2v36.3c0,27.4,30.2,57.4,37.8,59.6.8.2,1.7.4,2.5.4,2.8,0,5.5-1.4,7-3.9,3.1-4.9,7.7-15.3,9.3-21.8,9.1-37.7,4.1-92.5-12.1-133.1l-10.6-26.2v-132c3.8-4.1,7.6-8.2,11.4-12.3l29.3,29.3-30.7,30.8v14.2l37.8-37.8,31,31-68.8,68.8v6.1l2.3,5.7,73.6-73.6,31,31-88.4,88.4c1,3.8,1.9,7.6,2.7,11.5l92.8-92.8,31,31-118,117.9c0,8.2-.4,16.2-1.3,23.9l130.5-130.5,108,108,11.3-11.3-108-108,174.5-174.3-11.3-11.3-174.4,174.3-31-31,132-132-7.1-7.1-132,132-31-31,93.9-93.9-7.1-7.1-93.9,93.9-31-31,55.8-55.8-7.1-7.1-55.8,55.8-29.9-29.9c7.6-8.5,15.2-17.1,22.6-25.8l235.5-275.8c1.5-1.8,1.1-3.9-.2-5.2-1.3-1.3-3.4-1.8-5.2-.2ZM416.8,311.1c.5,3.5,1,9.7-.5,16.9-1.5,7.2-5,15.4-12.2,22.8l-49.7,50.9c-9.5,9.5-24.6,9.9-35.2-.7s-10.2-25.7-.7-35.2l50.9-49.7c7.4-7.2,15.6-10.7,22.8-12.2,7.2-1.5,13.4-1,16.9-.5,2,.3,3.8,1.3,5.2,2.6,1.2,1.2,2.2,3,2.5,5.1Z"/>
-  </g>
-</svg>
--- a/res/pictograms/CTR_small.svg
+++ b/res/pictograms/CTR_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M439,621.6c0-.9-.1-1.9-.1-2.9,0-4.2.4-8.4,1.3-12.4l-5.4,5.4c-88.1,88.2-230.4,90-320.8,5.5l16.4-16.4c81.5,75.6,208.9,73.8,288.1-5.5l176.6-176.7c79.3-79.3,81.1-206.7,5.5-288.3l52.7-52.8-11.3-11.3-29.2,29.3c-93.3-87.4-239.8-86.5-332,2.8,0,.9.1,1.9.1,2.9,0,4.2-.4,8.4-1.3,12.4l5.4-5.4c88.1-88.2,230.4-90,320.8-5.5l-16.4,16.4c-81.5-75.6-208.9-73.7-288.2,5.6l-176.6,176.6c-79.3,79.3-81.1,206.7-5.5,288.3l-52.7,52.8,11.3,11.3,29.2-29.3c93.3,87.4,239.9,86.5,332.1-2.8ZM135.9,312.6l176.6-176.7c73-73,190.2-74.9,265.5-5.5l-36.8,36.8c2,1.8,3.9,3.6,5.8,5.5s3.7,3.9,5.5,5.8l36.8-36.8c69.3,75.3,67.5,192.6-5.5,265.6l-176.6,176.7c-73,73-190.2,74.9-265.5,5.5l36.8-36.8c-2-1.8-3.9-3.6-5.8-5.5-1.9-1.9-3.7-3.9-5.5-5.8l-36.8,36.8c-69.3-75.2-67.5-192.5,5.5-265.6ZM193.8,526.1c1.9,1.9,3.9,3.7,5.9,5.4l39.1-39.1c21.5,16.1,52.1,14.3,71.7-5.2l176.5-176.6c19.6-19.6,21.3-50.2,5.2-71.7l39.1-39.1c-1.7-2-3.5-4-5.4-5.9s-3.9-3.7-5.9-5.4l-39,39c-21.5-16.1-52.1-14.3-71.7,5.2l-176.6,176.7c-19.6,19.6-21.3,50.2-5.2,71.7l-39.1,39.1c1.7,2,3.5,4,5.4,5.9ZM479.9,303.5l-176.5,176.6c-15.6,15.6-39.9,17.3-57.4,5.1l239.1-239.2c12.2,17.6,10.5,41.9-5.2,57.5ZM239.8,416.5l176.5-176.6c15.6-15.6,39.9-17.3,57.4-5.1l-239,239.1c-12.2-17.5-10.5-41.8,5.1-57.4ZM363.4,540.2l176.6-176.7c50.6-50.7,50.6-133.1,0-183.8-50.6-50.7-133-50.7-183.7,0l-176.6,176.8c-50.6,50.7-50.6,133.1,0,183.8,50.7,50.6,133.1,50.6,183.7,0ZM186.8,363.5l176.6-176.7c46.7-46.8,122.8-46.8,169.5,0s46.7,122.9,0,169.6l-176.6,176.8c-46.7,46.8-122.8,46.8-169.5,0-46.8-46.8-46.8-122.9,0-169.7ZM94.9,277.2c-28.2,0-51-22.8-51-51s9.8-34.6,24.4-43.5l22.1,45.7,9-4.4-22.1-45.7c5.5-2,11.4-3.1,17.6-3.1,28.2,0,51,22.8,51,51s-22.8,51-51,51ZM169,106.2c-.2-1.6-.2-3.3-.2-4.9,0-28.2,22.8-51,51-51s51,22.8,51,51-22.8,51-51,51-42.5-15.3-48.8-36.3l49.8-9.8-1.9-9.8-49.9,9.8ZM63.9,173.6l93.5-20.2,12,21.4,8.7-4.9-60-107.3c6-3.5,9.1-10.5,7.8-17.4l-.6-3.1c-.3-1.7-1.6-3-3.2-3.5s-3.4,0-4.6,1.2l-24.3,24.3c-2,2-2,5.2,0,7.2s2.3,1.5,3.6,1.5,1.5-.2,2.3-.5l10.2-5.1,18.4,32.8-59.4,59.4-8.5-17.6c-1.4-2.8-4.1-4.8-7.2-5.3-3.1-.5-6.3.5-8.5,2.7l-21,20.8,7.1,7.1,20.8-20.6,12.9,27.1ZM132.6,109l19.7,35.3-70.1,15.1,50.4-50.4ZM624.8,442.7c28.2,0,51,22.8,51,51s-9.8,34.6-24.4,43.5l-22.1-45.7-9,4.4,22.1,45.7c-5.5,2-11.4,3.1-17.6,3.1-28.2,0-51-22.8-51-51s22.9-51,51-51ZM550.8,613.7c.2,1.6.2,3.3.2,4.9,0,28.2-22.8,51-51,51s-51-22.8-51-51,22.8-51,51-51,42.5,15.3,48.8,36.3l-49.8,9.8,1.9,9.8,49.9-9.8ZM689.8,552.8l-20.8,20.6-13.2-27.1-93.5,20.2-12-21.4-8.7,4.9,60,107.3c-6,3.5-9.1,10.5-7.8,17.4l.6,3.1c.3,1.7,1.6,3,3.2,3.5,1.6.5,3.4,0,4.6-1.2l24.3-24.3c2-2,2-5.2,0-7.2s-2.3-1.5-3.6-1.5-1.5.2-2.3.5l-10.2,5.1-18.2-32.7,59.4-59.4,8.5,17.6c1.4,2.8,4.1,4.8,7.2,5.3,3.1.5,6.3-.5,8.5-2.7l21-20.8-7-7.2ZM587.2,610.9l-19.7-35.3,70.1-15.1-50.4,50.4ZM274.8,74.7c-1.5-3-3.2-5.9-5.2-8.7C335.7,8.9,422.9-11.2,503.9,5.9l-3.8,9.4c-78.1-15.9-162,3.9-225.3,59.4ZM445,645.3c1.5,3,3.2,5.9,5.2,8.7-66.1,57.1-153.3,77.1-234.3,60.1l3.8-9.4c78,15.9,161.9-3.9,225.3-59.4Z"/>
-  </g>
-</svg>
--- a/res/pictograms/DIV_small.svg
+++ b/res/pictograms/DIV_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M682,281c9.3-5.2,18.9-10.6,38-10.6v10c-16.5,0-24.5,4.5-33.1,9.4-9.3,5.2-18.9,10.6-38,10.6s-28.7-5.4-38-10.6c-8.6-4.8-16.6-9.4-33.1-9.4s-24.5,4.5-33.1,9.4c-9.3,5.2-18.9,10.6-38,10.6s-28.7-5.4-38-10.6c-2.8-1.6-5.5-3.1-8.5-4.5l7.5-7.5c2.1,1.1,4,2.2,5.9,3.2,8.6,4.8,16.6,9.4,33.1,9.4s24.5-4.5,33.1-9.4c9.3-5.2,18.9-10.6,38-10.6s28.7,5.4,38,10.6c8.6,4.8,16.6,9.4,33.1,9.4,16.5-.1,24.6-4.6,33.1-9.4ZM648.9,249.6c-16.5,0-24.5-4.5-33.1-9.4-9.3-5.2-18.9-10.6-38-10.6s-28.7,5.4-38,10.6c-8.6,4.8-16.6,9.4-33.1,9.4s-7.2-.2-10.2-.7l-8.5,8.5c5.1,1.3,11.2,2.2,18.7,2.2,19.1,0,28.7-5.4,38-10.6,8.6-4.8,16.6-9.4,33.1-9.4s24.5,4.5,33.1,9.4c9.3,5.2,18.9,10.6,38,10.6s28.7-5.4,38-10.6c8.6-4.8,16.6-9.4,33.1-9.4v-10c-19.1,0-28.7,5.4-38,10.6-8.5,4.9-16.6,9.4-33.1,9.4ZM682,158.8c-8.6,4.8-16.6,9.4-33.1,9.4s-24.5-4.5-33.1-9.4c-5.9-3.3-11.9-6.7-20.4-8.7l-8.6,8.6c10.8,1.3,17.3,5,24.2,8.8,9.3,5.2,18.9,10.6,38,10.6s28.7-5.4,38-10.6c8.6-4.8,16.6-9.4,33.1-9.4v-10c-19.2,0-28.8,5.5-38.1,10.7ZM648.9,208.9c-16.5,0-24.5-4.5-33.1-9.4-9.3-5.2-18.9-10.6-38-10.6s-19.2,1.9-25.8,4.5l-21.8,21.8c5.6-2,10.1-4.5,14.5-7,8.6-4.8,16.6-9.4,33.1-9.4s24.5,4.5,33.1,9.4c9.3,5.2,18.9,10.6,38,10.6s28.7-5.4,38-10.6c8.6-4.8,16.6-9.4,33.1-9.4v-10c-19.1,0-28.7,5.4-38,10.6-8.5,5-16.6,9.5-33.1,9.5ZM486.2,29.7v58.3h-14c-26.5,0-49.3,9.9-65.8,28.6-19.6,22.1-29.5,55.1-29.5,98.1v57.5h45.4l-10,10h-35.4v35.4l-10,10v-113c0-45.5,10.8-80.8,32-104.8,12-13.6,27-23,44.2-27.9H185.6c95.4,19,167.5,103.3,167.5,204.2v55.2l-10,10v-69.1h-103.4c43,9.6,73.9,36.4,92.4,80.2l-7.7,7.7c-21.6-54.4-63-81.9-123.1-81.9h-32.7l-22.6-30.8H0v-16h323v30.8h19.6c-7.2-102.8-93.1-184.2-197.7-184.2H0v-16h260.1l-49.2-49.4c-3.8-3.9-4.9-9.4-2.8-14.4C210.2,3.2,214.9,0,220.3,0h236.3c16.3,0,29.6,13.3,29.6,29.7ZM191.8,257.4h-33.5l10.9,14.8h11.7l10.9-14.8ZM293.1,257.4h-88.9l-10.9,14.8h88.9l10.9-14.8ZM313,257.4h-7.5l-10.9,14.8h18.4v-14.8ZM359.4,36h56.8V10h-56.8v26ZM282.7,46h-34.3l25.9,26h8.4v-26h0ZM282.7,10h-62.4c-1.9,0-2.7,1.4-3,2-.2.6-.7,2.1.7,3.5l20.4,20.5h44.3V10h0ZM349.4,46h-56.8v26h56.8v-26ZM349.4,10h-56.8v26h56.8V10ZM359.4,72h56.8v-26h-56.8v26ZM476.2,46h-50v26h50v-26ZM476.2,29.7c0-10.8-8.8-19.7-19.7-19.7h-30.3v26h50v-6.3ZM71.1,429.7c16.5,0,24.5,4.5,33.1,9.4,9.3,5.2,18.9,10.6,38,10.6s28.7-5.4,38-10.6c8.6-4.8,16.6-9.4,33.1-9.4s24.5,4.5,33.1,9.4c1.9,1.1,3.9,2.2,5.9,3.2l7.5-7.5c-3-1.4-5.7-2.9-8.5-4.5-9.3-5.2-18.9-10.6-38-10.6s-28.7,5.4-38,10.6c-8.6,4.8-16.6,9.4-33.1,9.4s-24.5-4.5-33.1-9.4c-9.3-5.2-18.9-10.6-38-10.6s-28.7,5.4-38,10.6C24.5,435.1,16.5,439.7,0,439.7v10c19.1,0,28.7-5.4,38-10.6,8.5-4.9,16.6-9.4,33.1-9.4ZM71.1,470.4c16.5,0,24.5,4.5,33.1,9.4,9.3,5.2,18.9,10.6,38,10.6s28.7-5.4,38-10.6c8.6-4.8,16.6-9.4,33.1-9.4s7.2.2,10.2.7l8.5-8.5c-5.1-1.3-11.2-2.2-18.7-2.2-19.1,0-28.7,5.4-38,10.6-8.6,4.8-16.6,9.4-33.1,9.4s-24.5-4.5-33.1-9.4c-9.3-5.2-18.9-10.6-38-10.6s-28.7,5.4-38,10.6C24.5,475.8,16.5,480.4,0,480.4v10c19.1,0,28.7-5.4,38-10.6,8.5-4.9,16.6-9.4,33.1-9.4ZM71.1,511.1c16.5,0,24.5,4.5,33.1,9.4,9.3,5.2,18.9,10.6,38,10.6s19.2-1.9,25.8-4.5l21.8-21.8c-5.6,2-10.1,4.5-14.5,7-8.6,4.8-16.6,9.4-33.1,9.4s-24.5-4.5-33.1-9.4c-9.3-5.2-18.9-10.6-38-10.6s-28.7,5.4-38,10.6C24.5,516.6,16.5,521.2,0,521.2v10c19.1,0,28.7-5.4,38-10.6,8.5-5,16.6-9.5,33.1-9.5ZM104.2,561.2c5.9,3.3,11.9,6.7,20.4,8.7l8.6-8.6c-10.8-1.3-17.3-5-24.2-8.8-9.3-5.2-18.9-10.6-38-10.6s-28.7,5.4-38,10.6c-8.6,4.8-16.6,9.4-33.1,9.4v10c19.1,0,28.7-5.4,38-10.6,8.6-4.8,16.6-9.4,33.1-9.4s24.6,4.5,33.2,9.3ZM397,447.8h-19.6c7.2,102.8,93.1,184.2,197.7,184.2h144.9v16h-260.1l49.2,49.4c3.8,3.9,4.9,9.4,2.8,14.4s-6.8,8.2-12.2,8.2h-236.3c-16.4,0-29.7-13.3-29.7-29.7v-58.3h14c26.5,0,49.3-9.9,65.8-28.6,19.6-22.1,29.5-55.1,29.5-98.1v-57.5h-45.4l10-10h35.4v-35.4l10-10v113c0,45.5-10.8,80.8-32,104.8-12,13.6-27,23-44.2,27.9h257.4c-95.4-19-167.5-103.3-167.5-204.2v-55.2l10-10v69.1h103.4c-43-9.6-73.9-36.4-92.4-80.2l7.7-7.7c21.6,54.4,63,81.9,123.1,81.9h32.7l22.6,30.8h146v16h-322.8v-30.8ZM243.8,674h50v-26h-50v26ZM263.4,710h30.3v-26h-50v6.3c.1,10.9,8.9,19.7,19.7,19.7ZM360.6,684h-56.8v26h56.8v-26ZM360.6,648h-56.8v26h56.8v-26ZM427.3,684h-56.8v26h56.8v-26ZM427.3,648h-56.8v26h56.8v-26ZM481.6,684h-44.3v26h62.4c1.9,0,2.7-1.4,3-2,.2-.6.7-2.1-.7-3.5l-20.4-20.5ZM445.8,648h-8.4v26h34.3l-25.9-26ZM528.2,462.6h33.5l-10.9-14.8h-11.7l-10.9,14.8ZM426.9,462.6h88.9l10.9-14.8h-88.9l-10.9,14.8ZM407,462.6h7.5l10.9-14.8h-18.4v14.8ZM653.7,77.7l-11.3-11.3L66.4,642.4l11.3,11.3L653.7,77.7Z"/>
-  </g>
-</svg>
--- a/res/pictograms/EDR_small.svg
+++ b/res/pictograms/EDR_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M0,149.7C0,99.6,31.6,57,75.9,40.5L116.4,0v33.3l99.8,49.9-16.6,33.3h-83.2v149.7c-64.3-.1-116.4-52.2-116.4-116.5ZM215.4,216c30.4-30.4,79.6-30.4,110,0l5.9,5.9,28.7-28.7,11.3,11.3-68,68,35.6,45.1-24.6,24.6-57.4-23.2-24.2,24.2-17.2-17.2c-30.5-30.3-30.5-79.6-.1-110ZM269.2,306.7l41.3,16.8,7-7-25.6-32.5-22.7,22.7ZM603.6,116.4v149.7c64.3,0,116.4-52.1,116.4-116.4s-31.6-92.7-75.9-109.2L603.6,0v33.3l-99.8,49.9,16.6,33.3h83.2ZM603.6,453.9v149.7h-83.2l-16.6,33.3,99.8,49.9v33.2l40.5-40.5c44.3-16.5,75.9-59.1,75.9-109.2s-52.1-116.4-116.4-116.4ZM116.4,603.6v-149.7c-64.3,0-116.4,52.1-116.4,116.4s31.6,92.7,75.9,109.2l40.5,40.5v-33.3l99.8-49.9-16.6-33.3h-83.2ZM490,237.1l64-59c2-1.8,3.3-4.1,3.7-6.2s0-4.2-1.4-5.6l-1.3-1.3-1.3-1.3c-1.4-1.4-3.4-1.8-5.6-1.4s-4.4,1.7-6.2,3.7l-59,64-252.9,252.9-64,59c-2,1.8-3.3,4.1-3.7,6.2s0,4.2,1.4,5.6l1.3,1.3,1.3,1.3c1.4,1.4,3.4,1.8,5.6,1.4s4.4-1.7,6.2-3.7l59-64,252.9-252.9ZM504.6,504c-30.4,30.4-79.6,30.4-110,0l-5.9-5.9-28.7,28.6-11.3-11.3,68-68-35.6-45.1,24.6-24.6,57.4,23.3,24.2-24.2,17.2,17.2c30.5,30.3,30.5,79.6,0,110ZM450.8,413.3l-41.3-16.8-7,7,25.6,32.5,22.7-22.7Z"/>
-  </g>
-</svg>
--- a/res/pictograms/EJP_small.svg
+++ b/res/pictograms/EJP_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M0,149.7C0,99.6,31.6,57,75.9,40.5L116.4,0v33.3l99.8,49.9-16.6,33.3h-83.2v149.7c-64.3-.1-116.4-52.2-116.4-116.5ZM215.4,216c30.4-30.4,79.6-30.4,110,0l5.9,5.9,28.7-28.7,11.3,11.3-68,68,35.6,45.1-24.6,24.6-57.4-23.2-24.2,24.2-17.2-17.2c-30.5-30.3-30.5-79.6-.1-110ZM269.2,306.7l41.3,16.8,7-7-25.6-32.5-22.7,22.7ZM603.6,116.4v149.7c64.3,0,116.4-52.1,116.4-116.4s-31.6-92.7-75.9-109.2L603.6,0v33.3l-99.8,49.9,16.6,33.3h83.2ZM603.6,453.9v149.7h-83.2l-16.6,33.3,99.8,49.9v33.2l40.5-40.5c44.3-16.5,75.9-59.1,75.9-109.2s-52.1-116.4-116.4-116.4ZM116.4,603.6v-149.7c-64.3,0-116.4,52.1-116.4,116.4s31.6,92.7,75.9,109.2l40.5,40.5v-33.3l99.8-49.9-16.6-33.3h-83.2ZM490,237.1l64-59c2-1.8,3.3-4.1,3.7-6.2s0-4.2-1.4-5.6l-1.3-1.3-1.3-1.3c-1.4-1.4-3.4-1.8-5.6-1.4s-4.4,1.7-6.2,3.7l-59,64-252.9,252.9-64,59c-2,1.8-3.3,4.1-3.7,6.2s0,4.2,1.4,5.6l1.3,1.3,1.3,1.3c1.4,1.4,3.4,1.8,5.6,1.4s4.4-1.7,6.2-3.7l59-64,252.9-252.9ZM504.6,504c-30.4,30.4-79.6,30.4-110,0l-5.9-5.9-28.7,28.6-11.3-11.3,68-68-35.6-45.1,24.6-24.6,57.4,23.3,24.2-24.2,17.2,17.2c30.5,30.3,30.5,79.6,0,110ZM450.8,413.3l-41.3-16.8-7,7,25.6,32.5,22.7-22.7Z"/>
-  </g>
-</svg>
--- a/res/pictograms/EVE_small.svg
+++ b/res/pictograms/EVE_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M0,149.7C0,99.6,31.6,57,75.9,40.5L116.4,0v33.3l99.8,49.9-16.6,33.3h-83.2v149.7c-64.3-.1-116.4-52.2-116.4-116.5ZM215.4,216c30.4-30.4,79.6-30.4,110,0l5.9,5.9,28.7-28.7,11.3,11.3-68,68,35.6,45.1-24.6,24.6-57.4-23.2-24.2,24.2-17.2-17.2c-30.5-30.3-30.5-79.6-.1-110ZM269.2,306.7l41.3,16.8,7-7-25.6-32.5-22.7,22.7ZM603.6,116.4v149.7c64.3,0,116.4-52.1,116.4-116.4s-31.6-92.7-75.9-109.2L603.6,0v33.3l-99.8,49.9,16.6,33.3h83.2ZM603.6,453.9v149.7h-83.2l-16.6,33.3,99.8,49.9v33.2l40.5-40.5c44.3-16.5,75.9-59.1,75.9-109.2s-52.1-116.4-116.4-116.4ZM116.4,603.6v-149.7c-64.3,0-116.4,52.1-116.4,116.4s31.6,92.7,75.9,109.2l40.5,40.5v-33.3l99.8-49.9-16.6-33.3h-83.2ZM490,237.1l64-59c2-1.8,3.3-4.1,3.7-6.2s0-4.2-1.4-5.6l-1.3-1.3-1.3-1.3c-1.4-1.4-3.4-1.8-5.6-1.4s-4.4,1.7-6.2,3.7l-59,64-252.9,252.9-64,59c-2,1.8-3.3,4.1-3.7,6.2s0,4.2,1.4,5.6l1.3,1.3,1.3,1.3c1.4,1.4,3.4,1.8,5.6,1.4s4.4-1.7,6.2-3.7l59-64,252.9-252.9ZM504.6,504c-30.4,30.4-79.6,30.4-110,0l-5.9-5.9-28.7,28.6-11.3-11.3,68-68-35.6-45.1,24.6-24.6,57.4,23.3,24.2-24.2,17.2,17.2c30.5,30.3,30.5,79.6,0,110ZM450.8,413.3l-41.3-16.8-7,7,25.6,32.5,22.7-22.7Z"/>
-  </g>
-</svg>
--- a/res/pictograms/FBL_small.svg
+++ b/res/pictograms/FBL_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M130.3,104.5l-16-16h491.3l-16,16h-224.6v113.2c-3.3-.1-6.7-.1-10,0v-113.2h-224.7ZM224.4,506.5l-146.7,146.8-11.4-11.3,82.3-82.3H0V159.6h148.6l-82.3-82.3,11.4-11.3,146.8,146.8-11.3,11.3-48.5-48.5H48.1c-3.2,16.2-16,28.9-32.1,32.1v304c16.1,3.2,28.9,15.9,32.1,32.1h116.5l48.5-48.5,11.3,11.2ZM16,197.4c10.6-2.8,19-11.2,21.8-21.8h-21.8v21.8ZM37.8,543.7c-2.8-10.6-11.2-19-21.8-21.8v21.8h21.8ZM720,559.7h-148.6l82.3,82.3-11.3,11.3-146.8-146.8,11.3-11.3,48.5,48.5h116.5c3.2-16.1,16-28.9,32.1-32.1V207.6c-16.1-3.2-28.9-15.9-32.1-32.1h-116.5l-48.5,48.5-11.3-11.3,146.7-146.7,11.3,11.3-82.3,82.3h148.7v400.1ZM704,521.9c-10.6,2.8-19,11.2-21.8,21.8h21.8v-21.8ZM704,175.6h-21.8c2.8,10.6,11.2,19,21.8,21.8v-21.8ZM442,243.7h43v-16h-72.4c10.5,4.2,20.3,9.6,29.4,16ZM360,491.7c-72.8,0-132.1-59.2-132.1-132.1s59.3-132,132.1-132,132.1,59.2,132.1,132.1-59.3,132-132.1,132ZM476.3,353.2l-22.8,25.7v45.8h9.7c11.9-18.8,18.8-41.1,18.8-65v-1.6l-5.7-4.9ZM392.5,247.6l28,24.8,34.7,18.1v-7.2c-14.5-18-34-31.9-56.4-39.4l-6.3,3.7ZM337.9,251.8l-28.1,24.9,21.9,20.8h56.5l21.9-20.8-28.1-24.9h-44.1ZM264.8,290.5l34.7-18.1,28.3-25.1-5.5-3.7c-22.9,7.4-42.8,21.4-57.6,39.8v7.1h.1ZM266.5,378.9l-22.8-25.7-5.7,4.8v1.6c0,23.9,6.9,46.2,18.8,65h9.7v-45.7h0ZM272.7,370.9l37-17.4,14.4-49.5-22.5-21.3-37.6,19.6-14.1,42.9,22.8,25.7ZM316.3,455.7l38.7-18.2v-44.8l-41.7-29.9-36.9,17.3v46.9l35.2,25.2,4.7,3.5ZM397.3,463.7l-37.3-17.5-37.3,17.6,7.7,14.3c9.5,2.4,19.4,3.6,29.6,3.6s20.1-1.3,29.6-3.6l7.7-14.4ZM443.5,380.2l-36.9-17.3-41.6,29.8v44.8l38.7,18.2,13.7-9.8,26.1-18.8v-46.9h0ZM447.3,370.9l22.8-25.8-14.1-42.9-37.6-19.6-22.5,21.4,14.4,49.5,37,17.4ZM694,268.8v-10h-57.3v202h57.3v-10h-47.3v-182h47.3ZM26,450.5v10h57.3v-202H26v10h47.3v182H26ZM365,614.8v-113.2c-3.3.1-6.7.1-10,0v113.2h-224.7l-16,16h491.3l-16-16h-224.6ZM110,367.6h108.2c-.1-2.6-.2-5.3-.2-8s.1-5.4.2-8h-108.2v16ZM526.7,434.2h-45.9c-3.5,5.6-7.3,11-11.5,16h57.4v-16ZM485,475.6h-43c-9.1,6.4-18.9,11.8-29.4,16h72.4v-16ZM568.3,392.9h-70.3c-1.3,5.5-2.9,10.8-4.9,16h75.1v-16h0ZM278,475.6h-43v16h72.4c-10.5-4.2-20.3-9.6-29.4-16ZM193.3,285h45.8c3.5-5.6,7.3-11,11.5-16h-57.3v16ZM610,351.6h-108.2c.1,2.6.2,5.3.2,8s-.1,5.4-.2,8h108.2v-16ZM498.1,326.3h70.3v-16h-75.1c1.8,5.2,3.5,10.6,4.8,16ZM151.7,326.3h70.3c1.3-5.5,2.9-10.8,4.9-16h-75.1v16h0ZM239.2,434.2h-45.8v16h57.3c-4.2-5-8-10.3-11.5-16ZM307.4,227.7h-72.4v16h43c9.1-6.4,18.9-11.8,29.4-16ZM221.9,392.9h-70.3v16h75.1c-1.8-5.2-3.5-10.5-4.8-16ZM480.8,285h45.9v-16h-57.4c4.2,5.1,8,10.4,11.5,16Z"/>
-  </g>
-</svg>
--- a/res/pictograms/FEN_small.svg
+++ b/res/pictograms/FEN_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M73.1,74.7c-.6-.6-.6-1.5,0-2.2.6-.6,1.5-.6,2.2,0,106,101.5,197.8,191,270.7,262.7v20.6c-67.9-69.2-157.7-161.3-273-281.1h0ZM65.4,288.8l-7.3,18.1-9.2-3.8,7.3-18.1c3.9-9.7,9.4-15.7,16.5-18.1v-9.4h82.9c39.4,0,62.7,31.4,62.7,83.9s-24.6,78.8-62.7,78.8h-4.8c-8.4,0-15.1,6.7-15.4,15-3.2-.1-5.9-1.4-8.3-3.6-7.4-7.4-9-24.2-9-30.1v-16h-9.9v16c0,1,0,25.2,11.9,37.1,11.9,11.9,9.4,6.4,15.3,6.7v11.1h-2.1c-9.5,0-17.1-2.9-23.1-9.2-15-15.4-14.3-45.2-14.3-45.7v-16h-9.9v15.8c0,1.4-.8,34.3,17.1,52.8,7.8,8.1,18.1,12.2,30.3,12.2h2.1v11.2h-5c-14.8,0-27.3-5-36.8-14.8-21.7-22.3-21-61.3-20.9-63v-121.6c-2.4,1.7-4.9,4.8-7.3,10.6h0ZM156.7,410.3c31.9-.6,51.7-26.9,51.7-68.8s-18.8-73.2-51.7-73.8v142.6h0ZM130.8,348.6h9.9v-81.1h-9.9v81.1ZM82.6,348.6h38.1v-81.1h-38.1v81.1ZM374.9,355.8c67.9-69.2,157.7-161.3,273-281.1.6-.6.6-1.5,0-2.2-.6-.6-1.5-.6-2.2,0-106,101.5-197.8,191-270.7,262.7v20.6ZM672.1,303.1l-9.2,3.8-7.3-18.1c-2.4-5.7-4.9-9-7.3-10.6v121.6c0,1.7.7,40.8-20.9,63-9.5,9.8-22,14.8-36.8,14.8h-5v-11.2h2.1c12.2,0,22.4-4.1,30.3-12.2,17.9-18.5,17.1-51.4,17.1-52.8v-15.8h-9.9v16c0,.4.7,30.3-14.3,45.7-6,6.2-13.6,9.2-23.1,9.2h-2.1v-11.1c5.9-.1,11.1-2.4,15.3-6.7,11.9-11.9,11.9-36.1,11.9-37.1v-16h-9.9v16c0,5.9-1.5,22.7-9,30.1-2.4,2.4-5,3.5-8.3,3.6-.3-8.3-7.1-15-15.4-15h-4.8c-38.1,0-62.7-31-62.7-78.8s23.4-83.9,62.7-83.9h82.9v9.4c7.1,2.4,12.7,8.5,16.5,18.1l7.3,18.1h0ZM564.1,267.5c-32.8.6-51.7,27.4-51.7,73.8s19.7,68.2,51.7,68.8v-142.6ZM590.2,267.5h-9.9v81.1h9.9v-81.1ZM638.2,267.5h-38.1v81.1h38.1v-81.1ZM67.1,642.3l11.3,11.3,50.4-50.4-11.3-11.3-50.4,50.4ZM651.9,595.4h0c0-31.1-25.2-56.2-56.2-56.2s-24.2,4.2-33.6,11.2l-32.2-32.2c-12.5-12.5-67.5-68.1-155.2-154.6v21.3c86.6,87.8,131.1,131.8,144,144.5l32.2,32.2c-7.3,9.7-11.2,21.3-11.2,33.6s.8,11.1,2.4,16.4l61.8-61.8c9.2,1.7,17.8,6,24.6,12.7,8.7,8.7,13.6,20.3,13.6,32.6s-3.4,20.2-9.5,28.2l-44-44-8.4,8.5,64.1,64.1,8.4-8.5-13-13c7.8-9.8,12.2-22.1,12.2-35.2ZM190.9,518.2l-29.4,29.4c-18.9-13.7-45.5-12-62.6,4.9l-3.2,3.2,68.5,68.5,3.2-3.2c16.8-16.8,18.6-43.1,5.3-62l29.4-29.6c12.9-12.9,57.4-56.7,144-144.5v-21.3c-87.7,86.6-142.7,142.3-155.2,154.6h0ZM408.4,72h-42.9v-10.4h9.2v-9.4c5.5-.6,10.9-2.2,15.7-5s3.2-4.5,1.8-6.9-4.5-3.2-6.9-1.8c-3.4,2-7.3,3.2-11.1,3.6-1-7-4.6-13-9.7-17.4V0h-20.4v18.1h-37.8v17.9h37.8v11.1c0,2,1.3,3.5,3.1,4.1,4.6,1.4,8,5.6,8,10.6v10.4h-42.9c8.4,15.8,24.2,26.9,42.9,28.6.4,183.7.6,400.1,3.4,578.3.3,13.4.7,27,1.1,40.5,0,.3.3.6.6.6h0c.3,0,.6-.3.6-.6.4-13.4.8-27,1.1-40.5,2.8-178.1,2.9-394.5,3.4-578.3,18.8-1.8,34.6-12.9,43-28.7Z"/>
-  </g>
-</svg>
--- a/res/pictograms/GAR_small.svg
+++ b/res/pictograms/GAR_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M446.7,273.3c-1.9-1.9-3.9-3.7-5.9-5.4l90.3-90.3,11.3,11.3-90.3,90.3c-1.7-2-3.5-4-5.4-5.9ZM22,33.4C22,17.3,26.1,0,37.8,0h644.4c11.7,0,15.8,17.3,15.8,33.4s-4.2,33.4-15.9,33.4h-17.7l-51.7,51.7,66.2,66.2-11.3,11.3-129.2-129.2H181.6L52.4,196.1l-11.4-11.3,66.2-66.2-51.7-51.8h-17.7c-11.7,0-15.8-17.2-15.8-33.4ZM159,66.8h-80.9l40.4,40.4,40.5-40.4ZM641.9,66.8h-80.9l40.4,40.4,40.5-40.4ZM32,33.4c0,15.2,4.2,23.4,5.9,23.4h644.4c1.7,0,5.9-8.2,5.9-23.4s-4.3-23.4-6-23.4H37.8c-1.7,0-5.8,8.2-5.8,23.4ZM720,209.6v-62.6h-64.7l16,16h32.7v46.6h3v300.7h-3v46.7h-32.7l-16,16h64.7v-62.6h-3V209.6h3ZM166.9,95.7h386.1l71.3,71.3v386.1l-71.3,71.3H166.9l-71.3-71.3V166.9l71.3-71.2ZM155,155v410h410V155H155ZM48.7,557H16v-46.6h-3V209.6h3v-46.6h32.7l16-16H0v62.6h3v300.7H0v62.7h64.7l-16-16ZM279.2,452.1c-2-1.7-4-3.5-5.9-5.4s-3.7-3.9-5.4-5.9l-90.3,90.3,11.3,11.3,90.3-90.3ZM698,686.6c0,16.2-4.2,33.4-15.9,33.4H37.8c-11.7,0-15.8-17.3-15.8-33.4s4.2-33.4,15.9-33.4h17.7l51.7-51.7-66.2-66.2,11.3-11.3,129.3,129.3h356.7l129.3-129.3,11.3,11.3-66.2,66.2,51.7,51.7h17.7c11.7,0,15.8,17.2,15.8,33.4ZM561,653.2h80.9l-40.4-40.4-40.5,40.4ZM78.1,653.2h80.9l-40.4-40.4-40.5,40.4ZM688,686.6c0-15.2-4.2-23.4-5.9-23.4H37.8c-1.7,0-5.9,8.2-5.9,23.4s4.2,23.4,5.9,23.4h644.4c1.7,0,5.8-8.2,5.8-23.4ZM333.4,461.6c30.6,0,56.9-18.3,68.6-44.6-5,.9-10.1,1.4-15.4,1.4s-2.3,0-3.4-.1c-10.5,16.4-28.9,27.3-49.8,27.3-32.6,0-59-26.4-59-59s10.9-39.3,27.3-49.8c0-1.1-.1-2.3-.1-3.4,0-5.3.5-10.4,1.4-15.4-26.3,11.7-44.6,38-44.6,68.6s33.6,75,75,75ZM392.3,382.1c5.5-.6,10.8-2.2,15.6-4.5-4.1-34.2-31.3-61.4-65.5-65.5-2.3,4.8-3.9,10.1-4.5,15.6,29,2.2,52.2,25.4,54.4,54.4ZM311.5,333.4c0-41.4,33.6-75,75-75s75,33.6,75,75-33.6,75-75,75-75-33.6-75-75ZM327.5,333.4c0,32.6,26.4,59,59,59s59-26.4,59-59-26.4-59-59-59-59,26.4-59,59Z"/>
-  </g>
-</svg>
--- a/res/pictograms/GLF_small.svg
+++ b/res/pictograms/GLF_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M223.2,481.1l-129.1,129c-2.9,2.9-7.6,2.9-10.5,0l-9-9c-2.9-2.9-2.9-7.6,0-10.5l129-129c9.8-9.8,20.2-18.9,31.1-27.4l6.1-4.7c11-8.5,21.4-17.7,31.3-27.6L560.6,114.2c1.7-1.8,14-13.4,18.9-19.3,8.3-9.9-16.2-20.1-33-38.2s-29.5-41.5-10.9-52.4c5.4-3.2,12.4-4.3,19.7-4.3s11.1.6,16.3,1.5c12.5,2.1,23.7,8.8,31.7,18.6,10.3,12.6,14.2,29.4,10.3,45.2-4.9,19.4-9.7,26.9-28,45.6h0l-302.9,302c-9.8,9.8-18.9,20.1-27.4,31.1l-4.9,6.3c-8.5,10.7-17.6,21.1-27.3,30.8ZM544.7,116c-12.7-5.1-26.1-7.1-40.8-6.3-9.7.5-19.9,3.7-30.6,7-13.2,4.1-27,8.4-41.8,8.4-32.2,0-51.6-11.4-70.3-22.5-19.8-11.7-38.5-22.7-73.5-22.7-67.3,0-114.6,46.7-131,65.6l89.6,89.6,46.9-46.9c-3.2-4.5-5-10-5-16,0-15.5,12.6-28,28-28s28,12.6,28,28-12.6,28-28,28-11.4-1.9-16-5l-46.9,46.9,82.3,82.3-11.3,11.3-82.3-82.3-169.2,169.3s-11.8-5.1-22.2-15.6-15.6-22.2-15.6-22.2l4.4-4.4c-1.7-2.1-3.5-4.2-5.6-6.3-10.4-10.4-22.2-15.6-22.2-15.6l38.4-38.5s11.8,5.1,22.2,15.6c10.4,10.5,15.6,22.2,15.6,22.2l-5.5,5.5c1.8,1.7,4,3.5,6.7,5.2,6.3,4.1,12.5,5.5,18,5.7l128-128L66.3,77.7l11.3-11.3,67.6,67.6c18.6-21.5,68.9-70.2,142.4-70.2s61.9,13.3,81.7,24.9c18.4,10.9,34.3,20.3,62.2,20.3s24.9-3.9,37-7.6c11.2-3.5,22.8-7.1,34.5-7.7,19.6-1.1,37.1,2.2,53.8,10.1l-12.1,12.2ZM175.3,604c12.7,5.1,26.1,7.1,40.8,6.3,9.7-.5,19.9-3.7,30.6-7,13.2-4.1,27-8.4,41.8-8.4,32.2,0,51.6,11.4,70.3,22.5,19.8,11.7,38.5,22.7,73.5,22.7,67.3,0,114.6-46.7,131-65.6l-89.6-89.5-46.9,46.9c3.2,4.5,5,10,5,16,0,15.5-12.6,28-28,28s-28-12.6-28-28,12.6-28,28-28,11.4,1.9,16,5l46.9-46.9-82.3-82.3,11.3-11.3,82.3,82.3,169.3-169.3s11.8,5.1,22.2,15.6,15.6,22.2,15.6,22.2l-4.4,4.4c1.7,2.1,3.5,4.2,5.6,6.3,10.4,10.4,22.2,15.6,22.2,15.6l-38.5,38.4s-11.8-5.1-22.2-15.6-15.6-22.2-15.6-22.2l5.5-5.5c-1.8-1.7-4-3.5-6.7-5.2-6.3-4.1-12.5-5.5-18-5.7l-128,128,168.7,168.7-11.3,11.3-67.7-67.7c-18.6,21.5-68.9,70.2-142.4,70.2s-61.9-13.3-81.7-24.9c-18.4-10.9-34.3-20.3-62.2-20.3s-24.9,3.9-37,7.6c-11.2,3.5-22.8,7.1-34.5,7.7-19.6,1.1-37.1-2.2-53.8-10.1l12.2-12.2ZM421.8,547.8c0-10-8.1-18-18-18s-18,8.1-18,18,8.1,18,18,18c9.9.1,18-8,18-18ZM673.9,547.8c0,12.7,10.3,23,23,23s23-10.3,23-23-10.3-23-23-23-23,10.3-23,23ZM298.2,172.2c0,10,8.1,18,18,18s18-8.1,18-18-8.1-18-18-18c-9.9,0-18,8-18,18ZM46.1,172.2c0-12.7-10.3-23-23-23S0,159.5,0,172.2s10.3,23,23,23,23-10.3,23-23ZM140.6,625.1c4.9-5.9,17.3-17.5,18.9-19.3l288.5-287.8c9.8-9.8,20.3-19,31.3-27.6l6.1-4.7c10.9-8.5,21.3-17.6,31.1-27.4l129-129c2.9-2.9,2.9-7.6,0-10.5l-9-9c-2.9-2.9-7.6-2.9-10.5,0l-129.1,129c-9.7,9.7-18.8,20.1-27.3,30.9l-4.9,6.3c-8.5,10.9-17.6,21.3-27.4,31.1l-302.9,302h.1c-18.3,18.6-23.1,26.2-28,45.6-4,15.8,0,32.5,10.3,45.2,8,9.8,19.2,16.5,31.7,18.6,5.2.9,10.8,1.5,16.3,1.5s14.4-1.1,19.8-4.3c18.6-10.9,5.9-34.4-10.9-52.4-16.9-18.1-41.5-28.3-33.1-38.2Z"/>
-  </g>
-</svg>
--- a/res/pictograms/GRY_small.svg
+++ b/res/pictograms/GRY_small.svg
--- a/res/pictograms/GTR_small.svg
+++ b/res/pictograms/GTR_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M141.4,567.3l11.3,11.3-75,75-11.3-11.3,75-75ZM172.9,184.2l11.3-11.3-106.5-106.6-11.4,11.4,106.6,106.5ZM547.1,535.8l-11.3,11.3,106.6,106.6,11.3-11.3-106.6-106.6ZM653.7,77.7l-11.3-11.3-75,75,11.3,11.3,75-75ZM551.9,577.3l7.1,7.1-135.6,135.6-88.8-88.8-53.4,53.4L35.4,438.8l53.4-53.4L0,296.6l135.6-135.6,7.1,7.1L14.1,296.6l81.7,81.7,40.7-40.7-15.5-15.5c-4.7,1.9-10.3,1-14.1-2.8-5.1-5.1-5.1-13.3,0-18.4s13.3-5.1,18.4,0c3.8,3.8,4.8,9.4,2.8,14.1l15.5,15.5,57.6-57.6-15.5-15.5c-4.7,1.9-10.3,1-14.1-2.8s-5.1-13.3,0-18.4c5.1-5.1,13.3-5.1,18.4,0,3.8,3.8,4.8,9.4,2.8,14.1l15.5,15.5,57.6-57.6-15.5-15.5c-4.7,1.9-10.3,1-14.1-2.8s-5.1-13.3,0-18.4c5.1-5.1,13.3-5.1,18.4,0,3.8,3.8,4.8,9.4,2.8,14.1l15.5,15.5,57.6-57.6-15.6-15.3c-4.7,1.9-10.3,1-14.1-2.8-5.1-5.1-5.1-13.3,0-18.4s13.3-5.1,18.4,0c3.8,3.8,4.8,9.4,2.8,14.1l15.5,15.5,40.7-40.7L296.6,14.2l-128.6,128.5-7.1-7.1L296.6,0l88.8,88.8,53.4-53.4,245.8,245.8-53.4,53.4,88.8,88.8-135.6,135.6-7.1-7.1,128.5-128.5-81.7-81.7-40.7,40.7,15.5,15.5c4.7-1.9,10.3-1,14.1,2.8,5.1,5.1,5.1,13.3,0,18.4s-13.3,5.1-18.4,0c-3.8-3.8-4.8-9.4-2.8-14.1l-15.5-15.5-57.5,57.5,15.5,15.5c4.7-1.9,10.3-1,14.1,2.8,5.1,5.1,5.1,13.3,0,18.4s-13.3,5.1-18.4,0c-3.8-3.8-4.8-9.4-2.8-14.1l-15.5-15.5-57.6,57.6,15.5,15.5c4.7-1.9,10.3-1,14.1,2.8,5.1,5.1,5.1,13.3,0,18.4-5.1,5.1-13.3,5.1-18.4,0-3.8-3.8-4.8-9.4-2.8-14.1l-15.5-15.5-57.6,57.6,15.5,15.5c4.7-1.9,10.3-1,14.1,2.8,5.1,5.1,5.1,13.3,0,18.4-5.1,5.1-13.3,5.1-18.4,0-3.8-3.8-4.8-9.4-2.8-14.1l-15.5-15.5-40.7,40.7,81.7,81.7,128.6-128.6ZM371.1,572.1l7.1-7.1-47.2-47.2,186.9-186.9,47.2,47.2,7.1-7.1-47.2-47.2,89.8-89.8-7.1-7.1-89.8,89.8-114.7-114.5,89.8-89.8-7.1-7.1-89.8,89.8-47.2-47.2-7.1,7.1,47.2,47.2-186.8,186.9-47.2-47.2-7.1,7.1,47.2,47.2-89.8,89.8,7.1,7.1,89.8-89.8,114.6,114.6-89.8,89.8,7.1,7.1,89.8-89.8,47.2,47.1ZM391.8,398.8l7.1-7.1-31.8-31.7,31.8-31.8-7.1-7.1-31.8,31.8-31.8-31.8-7.1,7.1,31.8,31.8-31.8,31.8,7.1,7.1,31.8-31.8,31.8,31.7Z"/>
-  </g>
-</svg>
--- a/res/pictograms/HBL_small.svg
+++ b/res/pictograms/HBL_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M143.7,154.7l-77.4-77.4,11.4-11.3,100.8,100.8c-11.1-5.3-22.7-9.4-34.8-12.1ZM66.3,642l11.3,11.3,100.7-100.7c-11,5.3-22.7,9.4-34.7,12.1l-77.3,77.3ZM175.1,380.5h10v-41.8h-10v41.8ZM235.2,385.9h10v-52.5h-10v52.5ZM230.8,248.9c4.1,14,4.2,30.2,4.3,47.1h10c-.1-19.8-.2-38.6-6.4-55.1l-7.9,8ZM230.8,470.4l7.9,7.9c6.2-16.4,6.3-35.3,6.4-55h-10c0,16.8,0,33.1-4.3,47.1ZM653.7,77.3l-11.4-11.3-100.8,100.8c11-5.3,22.7-9.4,34.7-12.1l77.5-77.4ZM541.6,552.5l100.7,100.7,11.3-11.3-77.4-77.4c-11.9-2.6-23.6-6.6-34.6-12ZM720,421.6h-47.6v138h-60.7c-40.9,0-79.3-16-108.3-44.9-3.8-3.8-7.5-7.9-10.9-12.3l-132.5,132.5-132.5-132.5c-3.5,4.3-7.1,8.5-10.9,12.3-29,29-67.4,44.9-108.3,44.9h-60.7v-138H0v-124h47.6v-138h60.7c40.9,0,79.3,16,108.3,44.9,3.8,3.8,7.5,7.9,10.9,12.3l132.5-132.4,132.5,132.5c3.5-4.3,7.1-8.5,10.9-12.3,29-29,67.4-44.9,108.3-44.9h60.7v137.9h47.6v124ZM365,449.3v157.9l247.6-247.6-247.6-247.6v158c-1.7-.1-3.3-.1-5-.1s-3.3.1-5,.1V112.1l-247.6,247.5,247.6,247.7v-158c1.7.1,3.3.1,5,.1s3.3,0,5-.1ZM47.6,405.6v-92h-31.6v92h31.6ZM216.1,491l-131.3-131.4,131.4-131.4c-3.4-4.4-7.1-8.5-10.9-12.3-26-26-60.4-40.3-97-40.3h-44.7v367.9h44.7c36.6,0,71.1-14.3,97-40.3,3.8-3.7,7.4-7.8,10.8-12.2ZM656.4,175.7h-44.7c-36.6,0-71.1,14.3-97,40.3-3.8,3.8-7.4,7.9-10.9,12.3l131.4,131.4-131.3,131.3c3.4,4.4,7.1,8.5,10.9,12.3,26,26,60.4,40.2,97,40.2h44.7V175.7h0ZM704,313.6h-31.6v92h31.6v-92ZM544.9,338.8h-10v41.8h10v-41.8ZM484.8,333.4h-10v52.5h10v-52.5ZM489.2,248.9l-7.9-7.9c-6.2,16.4-6.3,35.3-6.4,55h10c0-16.8,0-33.1,4.3-47.1ZM489.2,470.4c-4.1-14-4.2-30.2-4.3-47.1h-10c.1,19.8.2,38.6,6.4,55.1l7.9-8ZM366.8,441.2c8.7-.7,17.1-2.8,24.9-6.1l-4.8-4.2-20.1,10.3ZM323.6,319.7l3.5-23.4-8.4-7.3c-15.1,8.9-27.1,22.4-34,38.6l11.8,7.7,27.1-15.6ZM396.5,399.6l-3.5,23.4,8.3,7.3c15.1-8.9,27.1-22.4,34-38.6l-11.8-7.7-27,15.6ZM355,344.1l-26.9-15.5-26.9,15.5v31l26.9,15.5,26.9-15.5v-31ZM296.4,383.9l-11.8,7.7c6.9,16.2,18.9,29.8,34,38.6l8.4-7.3-3.5-23.3-27.1-15.7ZM353.3,278.1c-8.8.7-17.2,2.8-24.9,6.1l4.8,4.2,20.1-10.3ZM291.3,343.9l-10-6.6c-2,7.1-3.1,14.5-3.1,22.3s1.1,15.2,3.1,22.3l10-6.6v-31.4ZM386.4,399.1l-26.4-15.3-26.4,15.3,3.4,22.5,23.1,11.8,23.1-11.8,3.2-22.5ZM391.7,284.2c-7.8-3.3-16.2-5.4-24.9-6.1l20.1,10.3,4.8-4.2ZM365,375.2l26.9,15.5,26.9-15.5v-31l-26.9-15.5-26.9,15.4v31.1ZM333.6,320.2l26.4,15.3,26.4-15.3-3.4-22.5-23-11.8-23.1,11.8-3.3,22.5ZM423.6,335.4l11.8-7.7c-6.9-16.2-18.9-29.8-34-38.6l-8.4,7.3,3.5,23.4,27.1,15.6ZM428.7,375.4l10,6.6c2-7.1,3.1-14.5,3.1-22.3s-1.1-15.2-3.1-22.3l-10,6.6v31.4ZM328.3,435.1c7.8,3.3,16.1,5.4,24.9,6.1l-20.1-10.3-4.8,4.2Z"/>
-  </g>
-</svg>
--- a/res/pictograms/HOC_small.svg
+++ b/res/pictograms/HOC_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M215.6,160.9l71.7,71.6-14.6,14.6,11.3,11.3,26-26-94.3-94.3-26,26,11.3,11.3,14.6-14.5ZM146,445.9l1.7-9.9c-12.8-2.1-25.3-5.8-37.2-10.8l-3.9,9.2c12.6,5.3,25.9,9.2,39.4,11.5ZM14.9,344.1c5.6,12.5,12.6,24.4,21,35.3l7.9-6.1c-7.9-10.3-14.6-21.5-19.8-33.3l-9.1,4.1ZM10,279.9l-10,.4c.6,13.7,2.7,27.4,6.5,40.6l9.6-2.7c-3.5-12.5-5.6-25.4-6.1-38.3ZM170.9,438.2l-.3,10c13.7.3,27.5-.9,40.9-3.7l-2.1-9.8c-12.6,2.6-25.6,3.8-38.5,3.5ZM19,218.8l-9.5-3.3c-4.5,12.9-7.5,26.4-8.8,40.1l10,1c1.2-12.9,4-25.6,8.3-37.8ZM94.5,120l-7.1-7.1-28.3,28.3,7.1,7.1,28.3-28.3ZM49.8,165.3l-7.6-6.5c-9,10.4-16.7,21.9-23,34.1l8.9,4.6c5.9-11.6,13.2-22.4,21.7-32.2ZM89.8,414.6c-11-6.7-21.3-14.7-30.6-23.8l-7,7.1c9.8,9.7,20.7,18.2,32.4,25.2l5.2-8.5ZM168.4,287.9c0-4.5-3.6-8.1-8.1-8.1s-8.1,3.6-8.1,8.1,3.6,8.1,8.1,8.1,8.1-3.6,8.1-8.1ZM360,115.2c14.9,0,27-12.1,27-27s-12.1-27-27-27-27,12.1-27,27,12.1,27,27,27ZM180.3,498.9l11.9,11.9L488.7,219.6l-18.5-18.5c-12.4,12.4-32.8,39.4-48.9,55.2-5.7,5.6-37.8,37.8-76.7,77L77.6,66.3l-11.3,11.3,267.1,267c-69,69.6-153.1,154.3-153.1,154.3ZM615.7,55.7l-138.4,138.4,18.5,18.5c28.3-28.4,132.5-132.6,132.5-132.6,55.5-53.7,1.3-97.6-36.4-73-29.6,19.3-2.3,46.6,15.6,30.6,10.2-9.1,26,2,8.2,18.1ZM574,274.1l-1.7,9.9c12.8,2.1,25.3,5.8,37.2,10.8l3.9-9.2c-12.6-5.3-25.9-9.2-39.4-11.5ZM705.1,375.9c-5.6-12.5-12.6-24.4-21-35.3l-7.9,6.1c7.9,10.3,14.5,21.5,19.8,33.3l9.1-4.1ZM710,440.1l10-.4c-.6-13.7-2.7-27.4-6.5-40.6l-9.6,2.7c3.5,12.5,5.6,25.4,6.1,38.3ZM549.1,281.8l.3-10c-13.7-.3-27.5.9-40.9,3.7l2.1,9.8c12.6-2.6,25.6-3.8,38.5-3.5ZM701,501.2l9.5,3.3c4.5-12.9,7.5-26.4,8.8-40.1l-10-1c-1.2,12.9-4,25.6-8.3,37.8ZM625.5,600l7.1,7.1,28.3-28.3-7.1-7.1-28.3,28.3ZM670.2,554.7l7.6,6.5c9-10.4,16.7-21.9,23-34.1l-8.9-4.6c-5.9,11.6-13.2,22.4-21.7,32.2ZM630.2,305.4c11,6.7,21.3,14.7,30.6,23.8l7-7.1c-9.8-9.7-20.7-18.2-32.4-25.2l-5.2,8.5ZM504.4,559.1l-71.7-71.6,14.6-14.6-11.3-11.4-26,26,94.3,94.3,26-26-11.3-11.4-14.6,14.7ZM551.6,432.1c0,4.5,3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1-3.6-8.1-8.1-8.1-8.1,3.6-8.1,8.1ZM360,604.8c-14.9,0-27,12.1-27,27s12.1,27,27,27,27-12.1,27-27-12.1-27-27-27ZM539.7,221.1l-11.9-11.9L231.3,500.4l18.5,18.5c12.4-12.4,32.8-39.4,48.9-55.2,5.7-5.6,37.8-37.8,76.7-77l267.1,267,11.3-11.3-267.1-267c68.9-69.6,153-154.3,153-154.3ZM104.2,664.3l138.4-138.4-18.5-18.5c-28.3,28.4-132.4,132.6-132.4,132.6-55.5,53.7-1.3,97.6,36.4,73,29.6-19.3,2.3-46.6-15.6-30.6-10.2,9.1-26-2-8.3-18.1ZM310.9,336.4l-36.2,36.2c-55,55-144.1,55-199.1,0s-55-144.1,0-199.1l36.2-36.2,11.3,11.3-36.2,36.2c-48.7,48.7-48.7,127.7,0,176.5,48.7,48.8,127.7,48.7,176.5,0l36.2-36.2,11.3,11.3ZM409.1,383.6l36.2-36.2c55-55,144.1-55,199.1,0s55,144.1,0,199.1l-36.2,36.2-11.3-11.3,36.2-36.2c48.7-48.7,48.7-127.7,0-176.5-48.7-48.7-127.7-48.7-176.5,0l-36.2,36.2-11.3-11.3Z"/>
-  </g>
-</svg>
--- a/res/pictograms/JUD_small.svg
+++ b/res/pictograms/JUD_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M442.5,32.9c-13.1-8.4-25-17.8-37.6-32.9h-89.5c-12.6,15.2-24.5,24.6-37.6,32.9l-34.5,22-40,137.1-125.6-125.7-11.4,11.4,108,108L0,360l174.3,174.3-108,108,11.3,11.3,125.4-125.4,40,136.9,34.5,22c11.8,7.5,22.6,16.6,32.1,26.8l71.7-212.3h-89l-4.4-28.9h44.6l7.1,7.1,64.4-64.4,20.4,20.4-36.9,37h44.3l-4.4,28.9h-29.2l-73.7,218.3h70.8l-26.9-79.9,8.4-25,33.3,98.8c9.5-10.3,20.3-19.3,32.1-26.8l34.5-22,40-137.1,125.7,125.7,11.3-11.3-108-108,174.3-174.4-174.3-174.3,108-108-11.3-11.3-125.5,125.4-39.9-136.9-34.5-22ZM257,65.2l29.4-18.8c10.6-6.7,20.3-14.5,29.3-23.3l27.6,81.7,8.4-25-21.5-63.8h60l-68.3,202.4h-29.2l-4.4,28.9h44.3l-36.9,36.9-25.3-25.3,15.5-101.6-9.9-1.5-14.3,94.3-45.3-45.3,40.6-139.6ZM185.7,523L22.7,360l163-163,75.1,75.1-88,87.9,87.9,87.9-75,75.1ZM275.5,564.1l-14.3-94,8.8-8.8,15.4,101.3-9.9,1.5ZM267.8,440.9l-80.8-80.9,80.8-80.9,80.9,80.9-80.9,80.9ZM332.5,472.7l-36.9-36.9,20.4-20.4,36.9,36.9-20.4,20.4ZM360,348.7l-44-44,64.4-64.4,7.1,7.1h44.6l-4.4-28.9h-89L404.6,23.2c8.9,8.7,18.7,16.6,29.3,23.3l29.4,18.8,40.7,139.4-45.2,45.2-14.3-94-9.9,1.5,15.4,101.3-25.6,25.6-36.9-36.9-20.4,20.4,36.9,36.9-44,44ZM371.3,360l80.8-80.8,80.9,80.8-80.8,80.8-80.9-80.8ZM444.2,564.1l-9.9-1.5,15.4-101.6,8.8,8.8-14.3,94.3ZM459.2,447.9l87.9-87.9-87.9-87.9,75.1-75.1,163,163-163,163-75.1-75.1Z"/>
-  </g>
-</svg>
--- a/res/pictograms/MPN_small.svg
+++ b/res/pictograms/MPN_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M99.3,575.4l11.3,11.3-30.9,30.8-11.3-11.3,30.9-30.8ZM229.3,467.9c56.3-57.1,147-150,295.1-303.8.3-.3.4-.7.4-1.1s-.2-.8-.5-1.1l-.2-.2c-.3-.3-.7-.5-1.1-.5s-.8.1-1.1.4c-153.7,148.2-246.6,238.8-303.7,295.2-35.2,34.7-56.8,56.4-70.7,70.5-19.9-14.4-47.9-12.7-65.7,5.2l-5.7,5.7,71.9,71.8,5.7-5.7c17.9-17.9,19.6-45.9,5.2-65.7,14.1-13.9,35.7-35.5,70.4-70.7ZM239.1,235.6c2.8,0,5,2.2,5,5s-2.2,5-5,5h-27.9l-2.8,8.9h20.4c2.8,0,5,2.2,5,5s-2.2,5-5,5h-23.6l-2.8,8.9h16.1c2.8,0,5,2.2,5,5s-2.2,5-5,5h-19.3l-2.8,8.9h11.8c2.8,0,5,2.2,5,5s-2.2,5-5,5h-15l-.2.5c-4.4,13.8-8,20.6-15.4,33-6.2,10.5-13.4,22.5-15.5,31.9,6.1-4.6,10.9-6.6,15.6-6.6s7.9,2,9.7,3.2c1.6-.8,5.5-3.2,13.2-10.4,9-8.4,17.9-24.5,26.5-40,9.3-16.7,18-32.4,27.7-39.9,12.4-9.6,22.2-15.5,30.8-20.7,16.4-9.9,26.3-15.9,39.8-39.7l1.3-2.2c-9.5-8.6-27.5-22.7-49.6-30.3-17.3,13,.3,46.6-58.3,38.5l-4.7,16.1h25ZM334.3,218.4c-14.7,26-26.7,33.2-43.3,43.3-8.4,5.1-18,10.9-29.9,20.1-8.1,6.2-16.3,21.1-25.1,36.9-9,16.2-18.3,33-28.4,42.5-12.9,12.1-17.9,13.5-20.6,13.5s-3.4-.9-4.7-1.8-2.6-1.8-4.5-1.8c-3.4,0-8.4,3.1-15.6,9.6,0,0,9,19.7,42-4.2,0,0,33.7-20.3,54.4-55.1,5.5-9.2,12.6-17.3,21.2-23.5,30.2-21.6,46.1-41.5,46.1-41.5,25.4-26.3,15.8-33.1,8.4-38h0ZM116.3,116.4h83.1l16.6-33.2-99.7-49.9V0l-40.5,40.5C31.6,57,0,99.6,0,149.7s52.1,116.4,116.3,116.4V116.4ZM333.2,85.5c8.2,5.5,17.6,8.2,26.9,8.2s18.8-2.7,26.9-8.2c11-7.3,25.1-7.3,36.1,0,8,5.3,17.3,8.2,26.9,8.2v-16c-6.4,0-12.7-1.9-18.1-5.5-16.4-10.9-37.5-10.9-53.9,0-11,7.3-25.2,7.3-36.1,0-16.4-10.9-37.5-10.9-53.9,0-5.4,3.6-11.6,5.5-18.1,5.5v16c9.6,0,18.9-2.8,26.9-8.2,11.3-7.3,25.4-7.3,36.4,0ZM651.5,113.7l-11.3-11.3-30.8,30.8,11.3,11.3,30.8-30.8ZM333.2,49.5c8.2,5.5,17.6,8.2,26.9,8.2s18.8-2.7,26.9-8.2c11-7.3,25.1-7.3,36.1,0,8,5.3,17.3,8.2,26.9,8.2v-16c-6.4,0-12.7-1.9-18.1-5.5-16.4-10.9-37.5-10.9-53.9,0-11,7.3-25.2,7.3-36.1,0-16.4-10.9-37.5-10.9-53.9,0-5.4,3.6-11.6,5.5-18.1,5.5v16c9.6,0,18.9-2.8,26.9-8.2,11.3-7.3,25.4-7.3,36.4,0ZM333.2,121.5c8.2,5.5,17.6,8.2,26.9,8.2s18.8-2.7,26.9-8.2c11-7.3,25.1-7.3,36.1,0,8,5.3,17.3,8.2,26.9,8.2v-16c-6.4,0-12.7-1.9-18.1-5.5-16.4-10.9-37.5-10.9-53.9,0-11,7.3-25.2,7.3-36.1,0-16.4-10.9-37.5-10.9-53.9,0-5.4,3.6-11.6,5.5-18.1,5.5v16c9.6,0,18.9-2.8,26.9-8.2,11.3-7.3,25.4-7.3,36.4,0ZM467,438.7l7.5,7.5,24.4-24.4-8.6-8.6,92.4-92.4-11.3-11.3-92.4,92.4-5.3-5.3,115.5-115.5-11.3-11.3-201.5,201.4,9,19.2,14.4-14.4c4.8-4.8,12.5-4.8,17.3,0s4.8,12.5,0,17.3l-6,6,22.6,44.1,42.1-42.1-19.9-13.8c-7-4.9-7.9-14.9-1.9-20.9l11.9-11.9-7.5-7.5c-4.4-4.4-11.5-4.4-15.8,0l-10.4,10.4-7.1-7.1,12-12c8.2-8,21.7-8,29.9.2ZM386.8,598.5c-16.4-10.9-37.5-10.9-53.9,0-11,7.3-25.2,7.3-36.1,0-8-5.3-17.3-8.2-26.9-8.2v16c6.5,0,12.7,1.9,18.1,5.5,8.2,5.5,17.6,8.2,26.9,8.2s18.8-2.7,26.9-8.2c11-7.3,25.2-7.3,36.1,0,16.4,10.9,37.5,10.9,53.9,0,5.4-3.6,11.6-5.5,18.1-5.5v-16c-9.6,0-18.9,2.8-26.9,8.2-11.1,7.3-25.2,7.3-36.2,0ZM603.7,453.9v149.7h-83.1l-16.6,33.2,99.7,49.9v33.3l40.5-40.5c44.3-16.5,75.8-59.1,75.8-109.2s-52.1-116.4-116.3-116.4ZM572.5,192.8c19.9,14.4,47.9,12.7,65.7-5.2l5.7-5.7-71.9-71.9-5.7,5.7c-17.9,17.9-19.6,45.9-5.2,65.7-14.1,13.9-35.8,35.5-70.5,70.7-56.3,57.1-147,150-295.1,303.8-.3.3-.4.7-.4,1.1s.2.8.5,1.1l.2.2c.3.3.7.5,1.1.5s.8,0,1.1-.4c153.8-148.1,246.7-238.7,303.8-295.1,35.2-34.7,56.8-56.4,70.7-70.5ZM386.8,634.5c-16.4-10.9-37.5-10.9-53.9,0-11,7.3-25.2,7.3-36.1,0-8-5.3-17.3-8.2-26.9-8.2v16c6.5,0,12.7,1.9,18.1,5.5,8.2,5.5,17.6,8.2,26.9,8.2s18.8-2.7,26.9-8.2c11-7.3,25.2-7.3,36.1,0,16.4,10.9,37.5,10.9,53.9,0,5.4-3.6,11.6-5.5,18.1-5.5v-16c-9.6,0-18.9,2.8-26.9,8.2-11.1,7.3-25.2,7.3-36.2,0ZM386.8,670.5c-16.4-10.9-37.5-10.9-53.9,0-11,7.3-25.2,7.3-36.1,0-8-5.3-17.3-8.2-26.9-8.2v16c6.5,0,12.7,1.9,18.1,5.5,8.2,5.5,17.6,8.2,26.9,8.2s18.8-2.7,26.9-8.2c11-7.3,25.2-7.3,36.1,0,16.4,10.9,37.5,10.9,53.9,0,5.4-3.6,11.6-5.5,18.1-5.5v-16c-9.6,0-18.9,2.8-26.9,8.2-11.1,7.3-25.2,7.3-36.2,0Z"/>
-  </g>
-</svg>
--- a/res/pictograms/MTB_small.svg
+++ b/res/pictograms/MTB_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M487.5,665.3c15.9,17.5,2.6,33.6,2.6,33.6-138.8,64.1-201.8-37.5-205.9-44.6,10.8-6.6,28.1-11.3,48.7.3,43,24.3,80.3,30.1,120.9,18.8,20.4-5.6,27.9-7.7,33.7-8.1ZM383.2,627.5c-.1.3.1.6.3.7,32,12.4,56,1.9,75.6-2.3,5.3-1.1,20-3.8,29.4-4.6,3.2,4.3,5.8,8.7,7.8,12.3-7.7-.9-20.1,1.1-35.6,4.9-49.7,12.3-57.3,14.2-116.8-14.2-8.1-3.9-15.7-5.5-22.7-5.5s-2.2,0-3.3.2c9.3-7.2,18-11.8,25.8-14.1,7.6-2.2,15.5-2.8,23.3-2.1l25.9-34.5-24.8-24.8,7.1-7.1,66.5,66.4c16.8-6.3,30.2.7,40,10.5-29,3.3-49.7,14.2-68.3,15.5-9.7,1.2-19.7,0-29.6-1.7-.2-.1-.5,0-.6.4ZM383.8,606.3c9.4,3.2,27.6,6.6,47.6.4l-31.3-31.3-21.9,29.2c1.8.6,3.7,1.1,5.6,1.7ZM463.2,648.2c-51.5,12.7-60.8,15-123.5-14.8-19.9-9.5-33.8-2.4-43.5,6.2,4.2-1.1,7.5-1.8,12.4-1.8,8.8,0,18.6,2.2,29.2,8.2,41,23.2,74.9,28.5,113.3,17.9,22.4-6.2,30.2-8.4,37.2-8.6,2.5-3.3,5.8-6.6,10.3-11-6.9-2-18.1-.4-35.4,3.9ZM332.8,46.5c40.6-11.3,77.9-5.5,120.9,18.8,20.6,11.6,37.9,6.9,48.7.3-4.2-7.1-67.1-108.7-205.9-44.6,0,0-13.2,16.1,2.6,33.6,5.7-.3,13.2-2.4,33.7-8.1ZM419.5,117.2l-25.9,34.5,24.8,24.8-7.1,7.1-66.5-66.4c-16.8,6.3-30.2-.7-40-10.5,29-3.3,49.7-14.2,68.3-15.5,9.7-1.2,19.7,0,29.6,1.7.3,0,.5,0,.6-.4s-.1-.6-.3-.7c-32-12.4-56-1.9-75.6,2.3-5.3,1.1-20,3.8-29.4,4.6-3.2-4.3-5.8-8.7-7.8-12.3,7.7.9,20.1-1.1,35.6-4.9,49.7-12.3,57.3-14.2,116.8,14.2,8.1,3.9,15.7,5.5,22.7,5.5s2.2,0,3.3-.2c-9.3,7.2-18,11.8-25.8,14.1-7.6,2.2-15.5,2.8-23.3,2.1ZM408.4,115.3c-1.9-.5-3.8-1-5.6-1.6-9.4-3.2-27.6-6.6-47.6-.4l31.3,31.3,21.9-29.3ZM687.2,77.7l-11.3-11.3-120.2,120,11.3,11.3,120.2-120ZM544,350.1l-181,75.4-4.6,27.1-15.8-2.7,4.5-26-126.6-74.2,2.7-14.8,75.5-12.9c-9.1-32.4-38.9-56.2-74.2-56.2s-77.1,34.5-77.1,77,34.6,77,77.1,77,41.5-9.1,55.5-23.7l19.4,11.4c-18.2,21-45,34.3-74.9,34.3-54.7,0-99.1-44.3-99.1-99s44.4-99,99.1-99,85.1,31.7,96,74.5l46-7.9,9.6-55.7c-3.7-.1-7.3-.7-10.7-1.8-11.5-3.8-20.8-13.1-24.2-25.2l-2.1-7.5c-.8-3,0-6.2,2.3-8.3,2.2-2.2,5.5-2.9,8.4-1.9l79.1,25.9c5,1.6,7.8,7.1,6.1,12.1-1.3,3.9-4.9,6.6-9,6.6l-33.7.2-9.4,55.1,166.8,7.7-5.7,32.5ZM363.6,327.2l-40.5,6.9c.3,2.9.4,5.8.4,8.8,0,11.8-2.1,23.2-5.9,33.7l-19.4-11.4c2.1-7.1,3.3-14.6,3.3-22.3s-.1-3.4-.2-5l-53.9,9.2,102.5,60,13.7-79.9ZM543,333.2l-162.9-7.5-13.9,81.1,176.8-73.6ZM323.4,71.8c51.5-12.7,60.8-15,123.5,14.8,19.9,9.5,33.8,2.4,43.5-6.2-4.2,1.1-7.5,1.8-12.4,1.8-8.8,0-18.6-2.2-29.2-8.2-41-23.2-74.9-28.5-113.3-17.9-22.4,6.2-30.2,8.4-37.2,8.6-2.5,3.3-5.8,6.6-10.3,11,6.8,2,18.1.4,35.4-3.9ZM639.9,474.4c0-47.2-33.1-86.7-77.4-96.6l3.6-21.1,3,.5,9-52.4,27.9,5,2.8-15.8-28.5-5.1c-8.4-1.3-16.5,4.5-18,12.9l-9,52.6,3,.5-20.4,118.5,9.9,1.7,13-75.7c33.9,8.1,59.1,38.6,59.1,74.9s-34.6,77-77.1,77-77.1-34.5-77.1-77,33.5-75.9,75.1-77l3.8-22h-1.8c-54.7,0-99.1,44.3-99.1,99s44.4,99,99.1,99,99.1-44.2,99.1-98.9ZM592.5,570.4l83.3,83.3,11.3-11.3-80.8-80.8c-4.3,3.2-9,6.2-13.8,8.8ZM99.4,642.3l11.3,11.3,120.2-120.1-11.3-11.3-120.2,120.1ZM129.2,289.6l-93-31.2-3.2,9.5,91.7,30.8c1.4-3.1,2.9-6.1,4.5-9.1ZM230.9,186.4l-120.2-120.1-11.3,11.4,120.2,120.1,11.3-11.4ZM153.7,259.9l-117.5-39.4-3.2,9.5,112.5,37.7c2.6-2.8,5.4-5.4,8.2-7.8ZM117,323.5l-80.9-27.1-3.2,9.5,82.7,27.8c.4-3.5.8-6.8,1.4-10.2Z"/>
-  </g>
-</svg>
--- a/res/pictograms/OWS_small.svg
+++ b/res/pictograms/OWS_small.svg
--- a/res/pictograms/ROW_small.svg
+++ b/res/pictograms/ROW_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M383.6,253.4l73.2,73.2-9.6,4.5-73.2-73.2,9.6-4.5ZM346.9,230.8l9.6-4.5-45.9-45.9-7.1,7.1,43.4,43.3ZM416.6,198.3l-108.1-108.1-7.1,7.1,105.5,105.5,9.7-4.5ZM516.9,298.6l-73.2-73.2-9.6,4.5,73.2,73.2,9.6-4.5ZM474.3,358.2l58.2,58.2,7.1-7.1-55.6-55.6-9.7,4.5ZM629.8,411.5l-85.8-85.8-9.6,4.5,88.4,88.4,7-7.1ZM577,270.6l-73.2-73.2-9.6,4.5,73.2,73.2,9.6-4.5ZM594.4,302.2l118.5,118.5,7.1-7.1-115.9-115.9-9.7,4.5ZM476.6,170.3L306.4,0l-7.1,7.1,167.7,167.7,9.6-4.5ZM331.1,447.2l-73.2-73.2-4.5,9.6,73.2,73.2,4.5-9.6ZM358.2,474.3l-4.5,9.6,55.6,55.6,7.1-7.1-58.2-58.1ZM197.4,503.7l73.2,73.2,4.5-9.6-73.2-73.2-4.5,9.6ZM225.4,443.7l73.2,73.2,4.5-9.6-73.2-73.2-4.5,9.6ZM325.7,544l85.8,85.8,7.1-7.1-88.3-88.3-4.6,9.6ZM230.8,346.9l-43.3-43.3-7.1,7.1,45.9,45.9,4.5-9.7ZM297.7,604.1l115.9,115.9,7.1-7.1-118.5-118.5-4.5,9.7ZM174.8,467L7.1,299.3l-7.1,7.1,170.3,170.3,4.5-9.7ZM90.2,308.5l108.1,108.1,4.5-9.6-105.5-105.6-7.1,7.1ZM720,268.3l-8.8,6.1c-15.9,10.9-33.4,19.1-52.1,24.3l-8.9,2.5-8.2-4.6c-9.4-5.3-19.7-9.1-30.3-11l-3.5-.6-190.1,88.6,26.2,26.2c52.7,52.7,102.6,109.2,148.3,168l54.3,69.7c2.1,2.7,1.9,6.6-.6,9-1.3,1.3-3.1,2-4.9,2s-2.9-.5-4.2-1.4l-70.6-54.6c-58.3-45.4-114.4-94.9-166.7-147.2l-26.8-26.8-88.6,189.9.6,3.5c2,10.7,5.7,20.9,11,30.3l4.6,8.2-2.5,8.9c-5.2,18.6-13.3,36.1-24.3,52.1l-6.1,8.8-4.8-.6c-12.9-1.5-25.2-7.2-34.7-16.2l-3.4-3.2,2-8.2c7-28.8,19.1-55.8,36.1-80.1l6-8.6,91.8-196.9-85.5-85.5c-.9-.9-1.8-1.9-2.8-2.8l-97,207.9.6,3.5c2,10.7,5.7,20.9,11,30.3l4.6,8.2-2.5,8.9c-5.2,18.6-13.3,36.1-24.3,52.1l-6.1,8.8-4.8-.6c-12.9-1.5-25.2-7.2-34.7-16.2l-3.4-3.2,2-8.2c7-28.8,19.1-55.8,36.1-80.1l6-8.6,100.3-215c-47.2-48.3-92-99.6-133.4-152.9l-54.3-70c-2.1-2.7-1.9-6.6.6-9,2.4-2.4,6.3-2.7,9-.6l70.6,54.9c53,41.2,104,85.9,152.1,132.9l215.2-100.4,8.6-6c24.4-16.9,51.3-29,80.1-36.1l8.2-2,3.2,3.4c8.9,9.4,14.7,21.8,16.2,34.7l.6,4.8-8.8,6.1c-15.9,10.9-33.4,19.1-52.1,24.3l-8.9,2.5-8.2-4.6c-9.4-5.3-19.7-9.1-30.3-11l-3.5-.6-208.1,97c.7.7,1.5,1.5,2.3,2.2l86.1,86.1,197.1-91.9,8.6-6c24.4-16.9,51.3-29,80.1-36.1l8.2-2,3.2,3.4c8.9,9.4,14.7,21.8,16.2,34.7l1.1,4.6ZM283.6,258.4c-4.8-4.8-15.6-13.6-27.3-21.1-11.7-7.6-24.2-13.8-32.5-13.5,0,8.5,6.2,21.1,13.5,32.9,7.4,11.7,15.9,22.6,20.6,27.4l84.1,82.7,24.7-24.7-83.1-83.7ZM436,462.1c4.9,4.7,15.7,13.3,27.4,20.6,11.7,7.4,24.4,13.5,32.9,13.5.3-8.3-6-20.9-13.5-32.5-7.6-11.7-16.4-22.5-21.1-27.3l-83.7-83.1-24.7,24.7,82.7,84.1Z"/>
-  </g>
-</svg>
--- a/res/pictograms/RU7_small.svg
+++ b/res/pictograms/RU7_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M339.6,58.4l-17.1-17.1,7.1-7.1,17.1,17.1-7.1,7.1ZM312.4,17.1L295.3,0l-7.1,7.1,17.1,17.1,7.1-7.1ZM58.4,339.6l-17.1-17.1-7.1,7.1,17.1,17.1,7.1-7.1ZM380.9,85.6l-17.1-17.1-7.1,7.1,17.1,17.1,7.1-7.1ZM399.1,151.7l-87.6,87.6,25.5,25.5,87.6-87.6-7.1-7.1,14.7-14.7,132.4,132.4-14.7,14.7-7.1-7.1-87.6,87.6,25.5,25.5,87.6-87.6-7.1-7.1,158.8-158.7-11.3-11.3-132.7,132.6-132.5-132.4L576.2,11.3l-11.3-11.3-158.7,158.7-7.1-7ZM606.3,32.1c33.3-33.4,78.6-42.1,101.2-19.6s13.8,67.9-19.6,101.2c-33.4,33.4-78.7,42.1-101.2,19.6-22.5-22.5-13.8-67.9,19.6-101.2ZM672.8,98.6c-18.6,18.6-38.9,31.7-55.6,37.1,4.4.2,9.2-.1,14.2-1.1,17.2-3.3,34.8-13.3,49.5-28s24.7-32.3,28-49.5c1-5,1.3-9.7,1.1-14.2-5.5,16.8-18.6,37.1-37.2,55.7ZM675.4,21.3c-15,6.1-31.7,17.8-46.9,33s-26.9,31.9-33,46.9c-4.7,11.6-5.3,21.4-1.7,25.1,3.6,3.6,13.5,3,25.1-1.7,15-6.1,31.7-17.8,46.9-33s26.9-31.9,33-46.9c4.7-11.6,5.3-21.4,1.7-25.1-3.7-3.6-13.6-3-25.1,1.7ZM585.3,88.6c-1,5-1.3,9.7-1.1,14.2,5.4-16.7,18.5-37,37.1-55.6,18.7-18.6,39-31.7,55.7-37.1-4.4-.2-9.2.1-14.2,1.1-17.2,3.3-34.8,13.3-49.5,28s-24.6,32.3-28,49.4ZM24.2,305.3l-17.1-17.1-7.1,7.1,17.1,17.1,7.1-7.1ZM610.3,329.1l7.1-7.1-17.1-17.1-7.1,7.1,17.1,17.1ZM415.1,119.8l-17.1-17.1-7.1,7.1,17.1,17.1,7.1-7.1ZM109.7,390.9l-7.1,7.1,17.1,17.1,7.1-7.1-17.1-17.1ZM373.4,668.6l17.1,17.1,7.1-7.1-17.1-17.1-7.1,7.1ZM407.6,702.9l17.1,17.1,7.1-7.1-17.1-17.1-7.1,7.1ZM627.4,346.2l17.1,17.1,7.1-7.1-17.1-17.1-7.1,7.1ZM113.7,687.9c-33.3,33.4-78.6,42.1-101.2,19.6-22.5-22.6-13.8-67.9,19.6-101.3,33.4-33.4,78.7-42.1,101.2-19.6,22.5,22.6,13.8,67.9-19.6,101.3ZM47.2,621.4c18.6-18.6,38.9-31.7,55.6-37.1-4.4-.2-9.2,0-14.2,1.1-17.2,3.3-34.8,13.3-49.5,28s-24.7,32.3-28,49.5c-1,5-1.3,9.7-1.1,14.2,5.5-16.8,18.6-37.1,37.2-55.7ZM44.6,698.7c15-6.1,31.7-17.8,46.9-33s26.9-31.9,33-46.9c4.7-11.6,5.3-21.4,1.7-25.1-3.6-3.6-13.5-3-25.1,1.7-15,6.1-31.7,17.8-46.9,33-15.2,15.2-26.9,31.9-33,46.9-4.7,11.6-5.3,21.4-1.7,25.1,3.7,3.6,13.6,2.9,25.1-1.7ZM134.7,631.3c1-5,1.3-9.7,1.1-14.2-5.4,16.7-18.5,37-37.1,55.6-18.7,18.7-39,31.8-55.7,37.2,4.4.2,9.2,0,14.2-1.1,17.2-3.3,34.8-13.3,49.5-28,14.7-14.7,24.6-32.3,28-49.5ZM702.9,407.6l-7.1,7.1,17.1,17.1,7.1-7.1-17.1-17.1ZM661.6,380.4l17.1,17.1,7.1-7.1-17.1-17.1-7.1,7.1ZM320.9,568.3l87.6-87.6-25.5-25.5-87.6,87.6,7.1,7.1-14.7,14.7-132.5-132.4,14.7-14.7,7.1,7.1,87.6-87.6-25.5-25.5-87.6,87.6,7.1,7.1L0,564.9l11.3,11.3,132.7-132.7,132.5,132.5-132.7,132.7,11.3,11.3,158.7-158.7,7.1,7ZM75.5,356.7l-7.1,7.1,17.1,17.1,7.1-7.1-17.1-17.1ZM339.1,634.4l17.1,17.1,7.1-7.1-17.1-17.1-7.1,7.1ZM304.9,600.2l17.1,17.1,7.1-7.1-17.1-17.1-7.1,7.1ZM615.5,538l-7.1-7.1-35.2,35.2L153.8,146.8l35.2-35.2-7.1-7.1-35.2,35.2-71.2-71.3-7.1,7.1,71.2,71.2-35.1,35.3,7.1,7.1,35.2-35.2,419.4,419.4-35.2,35.2,7.1,7.1,35.2-35.2,71.2,71.2,3.5-3.6,3.5-3.5-71.2-71.2,35.2-35.3Z"/>
-  </g>
-</svg>
--- a/res/pictograms/SAL_small.svg
+++ b/res/pictograms/SAL_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M101.1,132.3l-7.1-7.1C137.7,81.6,164.5,41.6,191.3,0h11.9c-27.1,42.2-55.6,85.7-102.1,132.3ZM151.7,182.8c48.9-48.2,81.3-97.4,112.8-145.2C272.7,25.2,281,12.6,289.6,0h-12.1c-7.3,10.8-14.3,21.5-21.3,32.1-32.6,49.5-63.7,96.6-111.5,143.7l7,7ZM245.7,276.9l7.1,7.1c51.1-49,91.1-107.4,129.9-164.2,27.6-40.4,55.8-81.7,88.2-119.8h-13c-30.4,36.6-57.2,75.8-83.5,114.1-38.5,56.4-78.2,114.4-128.7,162.8ZM195.2,226.3l7.1,7.1c50-48.6,86.1-102.4,121.3-154.6,17.5-26.1,35.4-52.6,55.1-78.7h-12.5c-18.1,24.3-34.6,48.9-50.9,73.2-34.9,51.7-70.8,105.1-120.1,153ZM318.7,501.6c1.5.4,3,1,4.3,1.8,1.6,1,3,2.1,4.3,3.3,29.8-41.2,61.2-80.9,96.3-114.2l-7.1-7.1c-35.7,34.1-67.6,74.4-97.8,116.2ZM468.6,92.2c-6.5,8.9-71.5,95.6-71.5,95.6-4.2,6.9-2,16,5,20.2,3,1.8,7,.9,8.8-2.2l21.7-35.9,35.7,35.7c-29.3,32.3-85.2,97.3-100.6,140h0c89-70.9,166.9-173.6,235.9-264.4h0c-29.2,18.7-76.9,61.8-124.4,112.7l-38-38,25.3-41.8c3-4.9,9.4-6.5,14.3-3.5l11.1-18.6c-7.9-4.8-17-8.4-23.3.2ZM397,216.6c-1.6-1-3-2.1-4.3-3.3-29.8,41.2-61.2,80.9-96.3,114.2l7.1,7.1c35.9-34,67.7-74.3,97.9-116.1-1.6-.5-3.1-1.1-4.4-1.9ZM567.3,0h-14c-23.2,24.2-44.8,51-65.5,78.9,3.4,1.2,6.5,2.9,9.1,4.5,22.2-29.7,45.4-58.2,70.4-83.4ZM568.3,537.2c-48.9,48.2-81.3,97.4-112.8,145.2-8.2,12.4-16.5,25-25.1,37.6h12.1c7.3-10.8,14.3-21.5,21.3-32.1,32.6-49.5,63.7-96.6,111.5-143.7l-7-7ZM474.3,443.1l-7.1-7.1c-51.1,49-91.1,107.4-129.9,164.2-27.6,40.4-55.8,81.7-88.2,119.8h13c30.4-36.6,57.2-75.8,83.5-114.1,38.5-56.4,78.2-114.4,128.7-162.8ZM516.8,720h11.9c26.8-41.6,53.6-81.6,97.2-125.2l-7.1-7.1c-46.4,46.6-74.9,90.1-102,132.3ZM524.8,493.7l-7.1-7.1c-50,48.6-86.1,102.4-121.3,154.6-17.5,26.1-35.4,52.6-55.1,78.7h12.5c18.1-24.3,34.6-48.9,50.9-73.2,34.9-51.7,70.8-105.1,120.1-153ZM103.7,629.1c-5.1,6.8-10.2,13.4-15.2,20-1.9-.3-3.7-.9-5.4-2l-6.7-4.5,4.5-6.6c74.9-109.4,144.2-193,210.6-253.7l-10.9-10.9c-23.9,23.9-99.5,95.6-181.4,135.9l-4.1,2-2.4-3.9C34,407.9,12.5,297.8,4.7,222.7-3.7,141.4,1.8,82.1,1.8,81.5l1-10.6,300.6,300.6c10.7-9.4,21.3-18.2,31.8-26.4l5.5-4.3,12.6,12.2-5.5,4.3c-92.8,72.4-173.2,178.4-244.1,271.8ZM217.2,308L10.6,101.4c-1,23.5-1.5,67.2,4,120.5,7.3,70.6,27,172.3,78.7,264.7,51.7-92.3,105.7-157.7,123.9-178.6ZM273.5,364.3l-49.3-49.3c-18.6,21.5-73,87.7-124.6,180.8,78.9-40,150.9-108.5,173.9-131.5ZM152.7,720h14c23.2-24.2,44.8-51,65.5-78.9-3.4-1.2-6.5-2.9-9.1-4.5-22.2,29.7-45.4,58.2-70.4,83.4ZM251.4,627.8c6.5-8.9,71.5-95.6,71.5-95.6,4.2-6.9,2-16-5-20.2-3-1.8-7-.9-8.8,2.2l-21.8,35.8-35.7-35.7c29.3-32.3,85.2-97.3,100.6-140h0c-88.9,71-166.8,173.7-235.8,264.5h0c29.2-18.7,76.9-61.8,124.4-112.7l38,38-25.3,41.9c-3,4.9-9.4,6.5-14.3,3.5l-11.1,18.5c7.9,4.8,17,8.4,23.3-.2ZM718.2,638.4l-1,10.6-300.6-300.6c-10.7,9.4-21.3,18.2-31.8,26.4l-5.5,4.3-12.6-12.2,5.5-4.3c92.8-72.3,173.2-178.3,244.1-271.8,5.1-6.8,10.2-13.4,15.2-20,1.9.3,3.7.9,5.4,2l6.7,4.5-4.5,6.6c-74.9,109.4-144.2,193-210.6,253.7l10.9,10.9c23.9-23.9,99.5-95.6,181.4-135.9l4.1-2,2.4,3.9c58.6,97.5,80.2,207.5,88,282.7,8.4,81.4,2.9,140.7,2.9,141.2ZM502.8,412l206.5,206.5c1-23.5,1.5-67.2-4-120.5-7.3-70.6-27-172.3-78.7-264.7-51.6,92.4-105.6,157.8-123.8,178.7ZM446.5,355.7l49.3,49.3c18.6-21.5,73-87.7,124.6-180.8-78.9,40-151,108.5-173.9,131.5Z"/>
-  </g>
-</svg>
--- a/res/pictograms/SHO_small.svg
+++ b/res/pictograms/SHO_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M488,220.7l154.3-154.4,11.3,11.3-154.3,154.4-11.3-11.3ZM352,47.6v78h16V47.6c74.5,1.9,144.6,29.7,199.9,79.1l7.1-7.1c-55.2-49.4-127.5-80.1-207-82V0h-16v37.6c-79.4,1.9-151.8,32.6-207,82l7.1,7.1c55.3-49.5,125.4-77.3,199.9-79.1ZM126.7,567.9c-49.5-55.3-77.3-125.4-79.1-199.9h78v-16H47.6c1.9-74.5,29.7-144.6,79.1-199.9l-7.1-7.1c-49.4,55.2-80.1,127.5-82,207H0v16h37.6c1.9,79.4,32.6,151.8,82,207l7.1-7.1ZM488,499.3l154.4,154.4,11.3-11.3-154.4-154.4-11.3,11.3ZM524.5,499l7.1,7.1c71.7-84,71.7-208.3,0-292.3l-7.1,7.1c67.8,80.1,67.8,198.1,0,278.1ZM221,195.5c80.1-67.8,198-67.8,278.1,0l7.1-7.1c-84-71.7-208.3-71.7-292.3,0l7.1,7.1ZM499,524.5c-80.1,67.8-198,67.8-278.1,0l-7.1,7.1c84,71.7,208.3,71.7,292.3,0l-7.1-7.1ZM195.5,221l-7.1-7.1c-71.7,84-71.7,208.3,0,292.3l7.1-7.1c-67.8-80.1-67.8-198.1,0-278.1ZM682.4,352c-1.9-79.4-32.6-151.8-82-207l-7.1,7.1c49.4,55.3,77.2,125.4,79.1,199.9h-78v16h78c-1.9,74.5-29.7,144.6-79.1,199.9l7.1,7.1c49.4-55.2,80.1-127.5,82-207h37.6v-16h-37.6ZM368,672.4v-78h-16v78c-74.5-1.9-144.6-29.7-199.9-79.1l-7.1,7.1c55.2,49.4,127.5,80.1,207,82v37.6h16v-37.6c79.4-1.9,151.8-32.6,207-82l-7.1-7.1c-55.3,49.5-125.4,77.3-199.9,79.1ZM220.7,232l11.3-11.3L77.7,66.3l-11.4,11.4,154.4,154.3ZM220.7,488l-154.4,154.3,11.3,11.3,154.4-154.3-11.3-11.3ZM483.8,483.8h-247.6v-247.6h247.6v247.6ZM398,360c0-21-17-38-38-38s-38,17-38,38,17,38,38,38,38-17,38-38Z"/>
-  </g>
-</svg>
--- a/res/pictograms/SKB_small.svg
+++ b/res/pictograms/SKB_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M347.2,168.8l6.4,11.1h12.8l6.4-11.1-6.4-11.1h-12.8l-6.4,11.1ZM360,162.5c3.5,0,6.3,2.8,6.3,6.3s-2.8,6.3-6.3,6.3-6.3-2.8-6.3-6.3,2.8-6.3,6.3-6.3ZM332.1,168.8c0,15.4,12.5,27.9,27.9,27.9s27.9-12.5,27.9-27.9-12.5-27.9-27.9-27.9c-15.4,0-27.9,12.5-27.9,27.9ZM377.9,168.8c0,9.9-8,17.9-17.9,17.9s-17.9-8-17.9-17.9,8-17.9,17.9-17.9c9.9,0,17.9,8,17.9,17.9ZM574.7,600.1l28.1,28.1c-15.2-9.7-31.5-14.2-51-14.2s-36.9,4.8-52.5,15.2c-14.2,9.4-25.5,21.9-37.5,35.1-12.1,13.4-24.6,27.2-40.5,37.7-18.2,12-38.2,17.9-61.4,17.9s-43.2-5.9-61.4-17.9c-15.8-10.5-28.4-24.3-40.5-37.7-12-13.2-23.3-25.8-37.5-35.1-15.5-10.4-32.2-15.2-52.3-15.2s-35.7,4.5-51,14.2l28.1-28.1c7.3-1.4,14.9-2.1,22.8-2.1,23.1,0,43.2,5.9,61.4,17.9,15.8,10.5,28.4,24.3,40.5,37.7,12,13.2,23.3,25.8,37.5,35.1,15.7,10.4,32.4,15.2,52.5,15.2s36.9-4.8,52.5-15.2c14.2-9.4,25.5-21.9,37.5-35.1,12.1-13.4,24.6-27.2,40.5-37.7,18.2-12,38.2-17.9,61.4-17.9,7.9,0,15.5.7,22.8,2.1ZM230.1,74v17.9l-78.7,34.1,7.6,7.6,201-87.1,201.3,86.8,7.6-7.6-79-34v-17.9l91.2,39.6,12.2-12.2L360,0,126.9,101.5l12.2,12.2,91-39.7ZM365,19.6l114.9,49.9v17.8l-114.9-49.6v-18.1ZM240.1,69.7l114.9-50v18.1l-114.9,49.7v-17.8ZM288.9,168.8c0,39.2,31.9,71.1,71.1,71.1s71.1-31.9,71.1-71.1-31.9-71.1-71.1-71.1-71.1,31.9-71.1,71.1ZM421.1,168.8c0,33.7-27.4,61.1-61.1,61.1s-61.1-27.4-61.1-61.1,27.4-61.1,61.1-61.1,61.1,27.4,61.1,61.1ZM360,579.1c15.4,0,27.9-12.5,27.9-27.9s-12.5-27.9-27.9-27.9-27.9,12.5-27.9,27.9,12.5,27.9,27.9,27.9ZM360,533.4c9.9,0,17.9,8,17.9,17.9s-8,17.9-17.9,17.9-17.9-8-17.9-17.9,8-17.9,17.9-17.9ZM720,322.7c0-23.4-9.3-48-27.5-67.8l-6.5-6.5c-37.1-34.1-91.1-37-122.4-5.7l-154.8,154.8-37.5-37.5L653.7,77.7l-11.3-11.3-282.4,282.3L77.7,66.3l-11.4,11.4,110.2,110.2L21.8,342.7c-14.6,14.6-21.8,34.1-21.8,54.6s9.3,48,27.5,67.8l6.5,6.5c37.1,34.1,91.1,37,122.4,5.7l154.8-154.8,37.5,37.5L66.3,642.3l11.3,11.3,282.4-282.3,282.3,282.3,11.3-11.3-110.2-110.2,154.8-154.8c14.6-14.6,21.8-34.1,21.8-54.6ZM122.9,351.2c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM153.8,382.2c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM154.8,319.3c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM185.7,350.3c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM534.3,381.7c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM565.2,412.7c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM566.2,349.8c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM597.1,380.8c-3.3,0-6-2.7-6-6s2.7-6,6-6,6,2.7,6,6-2.7,6-6,6ZM360,622.3c39.2,0,71.1-31.9,71.1-71.1s-31.9-71.1-71.1-71.1-71.1,31.9-71.1,71.1,31.9,71.1,71.1,71.1ZM360,490.2c33.7,0,61.1,27.4,61.1,61.1s-27.4,61.1-61.1,61.1-61.1-27.4-61.1-61.1,27.4-61.1,61.1-61.1ZM366.4,562.4l6.4-11.1-6.4-11.1h-12.8l-6.4,11.1,6.4,11.1h12.8ZM360,544.9c3.5,0,6.3,2.8,6.3,6.3s-2.8,6.3-6.3,6.3-6.3-2.8-6.3-6.3,2.8-6.3,6.3-6.3Z"/>
-  </g>
-</svg>
--- a/res/pictograms/SRF_small.svg
+++ b/res/pictograms/SRF_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M329,135.8c0-90.5,29.6-119.8,29.6-119.8,0,0,29.6,29.4,29.6,119.8s-23,110.1-29.6,110.1-29.6-19.7-29.6-110.1ZM218.5,351.3c2-6.3-9.5-34.3-95.5-62.2C37,261.1,0,280.3,0,280.3c0,0,18.7,37.3,104.7,65.2,86,27.9,111.7,12.1,113.8,5.8ZM270.3,517.8c-5.3-3.9-35.5-1.5-88.6,71.6-53.1,73.2-46.4,114.3-46.4,114.3,0,0,41.2-6.3,94.3-79.5,53.1-73.1,46-102.5,40.7-106.4ZM577.6,425.1c44.5,61.3,39.1,143.8-8.3,198.8-2.5-4.8-5.4-9.7-8.5-14.9,39.3-49.4,42.7-121,3.9-174.5-18.1-24.9-42.7-42.2-69.7-51.5,20.3,10.3,38.3,25.7,52.4,45.3,36.5,50.3,33.9,110-3.5,155.3,0,0,0,0,0,0-1.2-1.7-2.4-3.3-3.6-4.8,34.5-42.5,37.7-98.1,2.3-146.8-24.5-33.8-59.6-52.9-95.8-56.4,28.3,5.7,54.8,22.1,73.8,48.2,30.1,41.5,28.9,91.9,0,130.4-1.4-1.6-2.7-3.1-4-4.5,27-36.6,27.2-83.6-.9-122.3-21-29-51.9-45.4-83.6-47.7,23.6,4.4,45.9,17.9,61.6,39.6,24.8,34.2,24.1,76.7,1.1,108.9-1.6-1.4-3.1-2.7-4.7-3.9,21.3-30.1,21.8-69.7-1.3-101.5-17.8-24.5-44.3-37.8-71.4-38.6,19.2,3.2,37.1,13.6,49.4,30.5,21.1,29,18.8,67.9-3.2,94.2-2.3-.8-4.5-1.3-6.5-1.7,22-24.3,24.8-61.5,4.8-89-20.7-28.6-59-37-89.4-21.3,63.6,53.6,76,148.3,26.4,216.6-44.5,61.3-124.6,81.7-191.6,53.5,3.8-3.9,7.6-8.1,11.5-12.7,59.1,22.1,128.2,3.3,167-50.2,18.1-24.9,27-53.6,27.4-82.3-3.6,22.5-12.6,44.4-26.8,63.9-36.5,50.3-94.1,66.3-148.7,44.6,0,0,0,0,.1,0,1.2-1.7,2.4-3.3,3.5-4.9,51.1,19.7,104.9,5.5,140.3-43.2,24.5-33.8,31.9-73.1,24-108.6,3.3,28.7-4,59-23,85.1-30.1,41.5-78.4,55.9-124,40.4,1.1-1.8,2.1-3.5,3.1-5.2,43.2,14.4,87.9,0,116-38.7,21-29,27.1-63.4,19.5-94.3,3.1,23.9-2.8,49.2-18.6,70.8-24.8,34.2-65.5,46.7-103.2,34.7.8-1.9,1.5-3.8,2.2-5.6,35.2,10.9,73-.8,96.1-32.6,17.8-24.5,22.2-53.8,14.7-79.9,2.9,19.2-1.5,39.5-13.7,56.4-21.1,29-58.8,38.9-90.6,26.1,0-2.4-.1-4.7-.4-6.7,29.9,13.5,66.1,4.6,86.1-22.9,20-27.6,17.1-64.9-5-89.2-31.6,76.5-117.4,117.1-197.4,91.1-72-23.4-116.1-93.3-110.1-165.8,4.9,2.4,10.1,4.7,15.6,7-2.8,63.1,36.5,123,99.4,143.4,29.2,9.5,59.3,9.1,86.7.7-22.5,3.6-46.1,1.7-69-5.8-59.1-19.2-92.1-69-88.4-127.7h0c2,.6,3.8,1.2,5.7,1.8-3,54.7,27.2,101.5,84.4,120.1,39.7,12.9,79.3,7.8,110.6-10.7-26.2,12-57.3,14.4-88.1,4.4-48.8-15.8-77.4-57.4-76.7-105.5,2,.5,4,.9,5.9,1.3-.3,45.5,27.1,83.6,72.6,98.4,34,11.1,68.6,6.2,95.6-10.6-21.7,10.3-47.6,12.5-73.1,4.2-40.2-13-64.6-47.9-64.9-87.5,2.1.2,4.1.3,6,.4.5,36.9,23.3,69.2,60.7,81.4,28.8,9.3,58,4.5,80.5-10.7-17.4,8.7-38,10.8-57.9,4.4-34.1-11.1-55.1-43.9-52.8-78.1,2.3-.7,4.4-1.6,6.3-2.5-3.6,32.6,16,64.4,48.4,74.9,34,11.1,70.5-5.2,85.5-36.7-84.5-4.2-152-74.4-152-160s52.8-139.4,123.6-155.9c-.7,5.4-1.4,11-1.9,17-60.8,17.2-105.6,73.1-105.6,139.2s9.7,59.3,26.2,82.7c-10.3-20.3-15.8-43.3-15.8-67.5,0-62.2,37.2-108.9,94.1-123.5h0c0,2.2,0,4.1.1,6.1-52.9,14.1-88.1,57.2-88.1,117.4s17.1,77.9,44.4,101.9c-19.5-21.2-31.4-50.1-31.4-82.4,0-51.3,30.6-91.4,76.6-105.6.2,2.1.4,4.1.6,6-43.4,13.7-71.1,51.6-71.1,99.5s15.3,67.2,39.6,87.7c-16.5-17.5-26.6-41.4-26.6-68.2,0-42.2,25.6-76.3,63.1-88.8.5,2,1,4,1.5,5.9-34.9,11.8-58.6,43.6-58.6,82.9s13.6,56.6,35.1,73.2c-13.6-13.8-22-32.8-22-53.7,0-35.8,24.7-66,58-74.4,1.4,2,2.8,3.7,4.3,5.2-32.1,6.7-56.2,35.2-56.2,69.2s26,64.6,59.9,69.8c-20-80.7,25.7-164.6,105.9-190.8,72-23.4,148.8,7.2,186.4,69.4-5.3.9-10.9,2.1-16.8,3.5-34.8-52.7-101.8-78-164.7-57.6-29.2,9.5-53.3,27.5-70.5,50.4,16.1-16.1,36.3-28.5,59.2-35.9,59.1-19.2,115,1.7,146.5,51.3h0c-2,.6-3.8,1.3-5.7,1.9-29.7-46-81.6-66.2-138.8-47.6-39.7,12.9-68.8,40.4-83.2,73.8,14.1-25.1,37.9-45.4,68.7-55.3,48.8-15.8,96.3.9,124,40.2-1.9.8-3.8,1.6-5.6,2.4-26.5-37-71.1-51.7-116.6-36.9-34,11.1-59.2,35.3-71.2,64.8,11.5-21.1,31.2-38.1,56.6-46.4,40.2-13,80.4.8,103.9,32.6-1.8,1.1-3.5,2.2-5.1,3.3-22-29.6-59.5-42.3-96.9-30.2-28.8,9.3-49.6,30.5-58.8,56,9-17.2,24.4-31.1,44.3-37.6,34.1-11.1,70.4,3.1,88.6,32.2-1.5,2-2.7,3.9-3.6,5.7-16.2-28.4-50.8-42.6-83.1-32.1-33.6,10.9-53.4,44.7-47.9,78.5,70.4-43.7,164.2-26.2,213.9,42.1ZM446.9,517.8c-5.3,3.9-12.4,33.3,40.7,106.5s94.3,79.5,94.3,79.5c0,0,6.7-41.2-46.4-114.3-53.1-73.2-83.3-75.6-88.6-71.7ZM597,287.5c-86,28-97.5,55.9-95.5,62.2,2,6.3,27.8,22.1,113.8-5.8,86-28,104.7-65.2,104.7-65.2,0,0-37.1-19.1-123,8.8Z"/>
-  </g>
-</svg>
--- a/res/pictograms/SWA_small.svg
+++ b/res/pictograms/SWA_small.svg
--- a/res/pictograms/SWM_small.svg
+++ b/res/pictograms/SWM_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M720,360l-13.6-3.4c-12.4-3.2-18.6-11.2-22.8-29.7l-.3-1.5c-5.8-23.4-22.1-39.1-47.1-45.4-18.4-4.6-32.7-19-37.4-37.6l-1.5-6.1c-5.1-20.6-21-36.5-41.6-41.4-4.8-1.2-9.3-3.2-13.3-6l111.3-111.3-11.3-11.3-282.4,282.4L77.7,66.3l-11.4,11.4,107.9,107.9L0,360l13.6,3.4c12.4,3.2,18.6,11.2,22.8,29.7l.3,1.5c5.8,23.4,22.1,39.1,47.1,45.4,18.4,4.6,32.7,19,37.4,37.6l1.5,6.1c5.1,20.6,21,36.5,41.6,41.4,4.8,1.2,9.3,3.2,13.3,6l-111.3,111.2,11.3,11.3,282.4-282.3,282.3,282.3,11.3-11.3-107.9-107.9,174.3-174.4ZM189,519.7c-6.2-4.8-13.4-8.2-21-10.1-14.7-3.6-26.1-14.9-29.8-29.7l-1.5-6.1c-6-24.3-24.8-43.2-49-49.3-19.1-4.8-31-16.1-35.4-33.6l-.3-1.3c-3.1-13.9-8.4-28.5-22.3-36.8l156-156,35.5,35.5-133,133-8.5-8.5-7.1,7.1,24.1,24.1,7.1-7.1-8.5-8.5,133-133,35.4,35.4-133,133-8.5-8.5-7.1,7.1,24.1,24.1,7.1-7.1-8.5-8.5,133-133,35.4,35.4-133,133-8.5-8.5-7.1,7.1,24.1,24.1,7.1-7.1-8.5-8.5,133-133,35.5,35.5-159.8,159.8ZM498.9,487.5l133-133,8.5,8.5,7.1-7.1-24.1-24.1-7.1,7.1,8.5,8.5-133,133-35.4-35.4,133-133,8.5,8.5,7.1-7.1-24.1-24.1-7.1,7.1,8.5,8.5-133,133-35.4-35.4,133-133,8.5,8.5,7.1-7.1-24.1-24.1-7.1,7.1,8.5,8.5-133,133-35.5-35.4,159.7-159.7c6.2,4.8,13.4,8.2,21,10.1,14.7,3.6,26.1,14.9,29.8,29.7l1.5,6.1c6,24.3,24.8,43.2,49,49.3,19.1,4.8,31,16.1,35.4,33.6l.3,1.3c3.1,13.9,8.4,28.5,22.3,36.8l-156,156-35.4-35.7ZM409,148.8c-3.2,3.2-2.3,5.5-1.4,7l.3.5c7.1,11.8-9.2,30.2-28,41.5-1,.6-2.1,1.2-3.1,1.8v-46.8c8.3-2.7,16.3-3.8,22.4-2.4.6-2.6,2-5,4.2-7.3s4.7-3.6,7.3-4.2c-2.5-10.6,2.7-27.2,11-41.1,4.5-7.5,10.1-14.6,16-19.9v65.4c-7.5,5.6-15.2,8-21.1,4.4l-.5-.3c-1.5-.9-3.9-1.8-7.1,1.4ZM261.3,102.1c-4.1-25.9,4.2-47.1,29.1-72C315.3,5.2,336.5-3.2,362.4,1c47.3,7.6,87.9,49.7,103.8,71.3h0c7.8,9.1,2.2,30.3-8,47.3-3,5.1-6.6,10-10.4,14.3v-63.2c-25.4-6.3-59,5.1-85.3,31.4-26.3,26.3-37.7,59.9-31.4,85.3,4.7-9.2,15.4-19,27.2-26,2.8-1.7,5.7-3.2,8.7-4.6v47.6c-13.7,5.6-27.4,7.3-34.3,1.5-21.7-15.9-63.9-56.5-71.4-103.8ZM458.8,617.9c4.1,25.9-4.2,47.1-29.1,72s-46.1,33.3-72,29.1c-47.3-7.6-87.9-49.7-103.8-71.3h0c-7.8-9.1-2.2-30.3,8-47.3,3-5.1,6.6-10,10.4-14.3v63.2c25.4,6.3,59-5.1,85.3-31.4,26.3-26.3,37.7-59.9,31.4-85.3-4.7,9.2-15.4,19-27.2,26-2.8,1.7-5.7,3.2-8.7,4.6v-47.6c13.7-5.6,27.4-7.3,34.3-1.5,21.7,15.9,63.8,56.5,71.4,103.8ZM311,571.2c3.2-3.2,2.3-5.5,1.4-7l-.3-.5c-7.1-11.8,9.2-30.2,28-41.5,1-.6,2.1-1.2,3.1-1.8v46.8c-8.3,2.7-16.3,3.8-22.4,2.4-.6,2.6-2,5-4.2,7.3-2.2,2.2-4.7,3.6-7.3,4.2,2.5,10.6-2.7,27.2-11,41.1-4.5,7.5-10.1,14.6-16,19.9v-65.4c7.5-5.6,15.2-8,21.1-4.4l.5.3c1.6.9,3.9,1.8,7.1-1.4Z"/>
-  </g>
-</svg>
--- a/res/pictograms/TEN_small.svg
+++ b/res/pictograms/TEN_small.svg
--- a/res/pictograms/TKW_small.svg
+++ b/res/pictograms/TKW_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M286.7,138.8h.7c3.9,21.5,20.3,38.7,41.5,43.7l6.4,1.5c8.1,1.9,16.4,2.9,24.8,2.9s16.7-1,24.8-2.9l6.4-1.5c21.1-5,37.5-22.2,41.5-43.7h.7c6.6,0,12-5.4,12-12v-42.8c0-6.6-5.4-12-12-12-.7-10.3-3.1-22.1-7-30.2-1.3-2.6-3.9-4.2-6.8-4.4C408.9,15.3,386.2,0,360,0s-48.9,15.3-59.6,37.4c-2.9,0-5.5,1.8-6.8,4.4-3.9,8.1-6.3,19.9-7,30.2-6.6,0-12,5.4-12,12v42.8c.1,6.6,5.4,12,12.1,12ZM322.3,70.1c1.8,0,3.5,0,5.3.2l14.7,1.8c5.9.7,11.8,1.1,17.7,1.1s11.8-.4,17.7-1.1l14.7-1.8c1.8-.2,3.5-.3,5.3-.2,8.3.6,16.5,2,24.5,4.1l-3.6,33.1c-4.6,21.7-5.3,45.8-34.6,59.7-2.8,1.3-4.7,4-4.9,7v.9c-12.5,2.5-25.7,2.5-38.2,0v-.9c-.2-3-2.1-5.7-4.9-7-29.3-13.9-30-38-34.6-59.7l-3.6-33.1c8-2.1,16.2-3.5,24.5-4.1ZM433.3,581.2h-.7c-3.9-21.5-20.3-38.7-41.5-43.7l-6.4-1.5c-16.1-3.8-33.5-3.8-49.6,0l-6.4,1.5h0c-21.1,5-37.5,22.2-41.5,43.7h-.7c-6.6,0-12,5.4-12,12v42.8c0,6.6,5.4,12,12,12,.7,10.3,3.1,22.1,7,30.2,1.3,2.6,3.9,4.2,6.8,4.4,10.7,22.1,33.3,37.4,59.6,37.4s48.9-15.3,59.6-37.4c2.9,0,5.5-1.8,6.8-4.4,3.9-8.1,6.3-19.9,7-30.2,6.6,0,12-5.4,12-12v-42.8c0-6.6-5.3-12-12-12ZM397.7,649.9c-1.8,0-3.5,0-5.3-.2l-14.7-1.8c-5.9-.7-11.8-1.1-17.7-1.1s-11.8.4-17.7,1.1l-14.7,1.8c-1.8.2-3.5.3-5.3.2-8.3-.6-16.5-2-24.5-4.1l3.6-33.1c4.6-21.7,5.3-45.8,34.6-59.7,2.8-1.3,4.7-4,4.9-7v-.9c12.5-2.5,25.7-2.5,38.2,0v.9c.2,3,2.1,5.7,4.9,7,29.3,13.9,30,38,34.6,59.7l3.6,33.1c-8,2.1-16.2,3.5-24.5,4.1ZM469.4,322.8h10v74.4h-10v-74.4ZM250.6,397.2h-10v-74.4h10v74.4ZM720,360l-174.3-174.3,108-108-11.3-11.3-167.8,167.6-44.2-44.2h-32.1l-1.2,3.3c-5.6,15.6-20.5,26.1-37.1,26.1s-31.5-10.5-37.1-26.1l-1.2-3.3h-32.1l-44.2,44.2L77.7,66.3l-11.4,11.4,108,108L0,360l174.3,174.3-108,108,11.3,11.3,167.8-167.6,44.2,44.2h32.1l1.2-3.3c5.6-15.6,20.5-26.1,37.1-26.1s31.5,10.5,37.1,26.1l1.2,3.3h32.1l44.2-44.2,167.7,167.7,11.3-11.3-108-108,174.4-174.4ZM348.7,360l-107.6,107.6-41.2-41.2v-132.7l41.2-41.2,107.6,107.5ZM371.3,360l107.6-107.6,41.2,41.2v132.7l-41.2,41.2-107.6-107.5ZM293.7,199.9h21.1c7.9,17.8,25.6,29.5,45.2,29.5s37.4-11.7,45.2-29.5h21.1l41.2,41.2h-215.1l41.3-41.2ZM185.7,523L22.7,360l163-163,48.4,48.4-44.2,44.2v140.9l44.2,44.2-48.4,48.3ZM426.3,520.1h-21.1c-7.9-17.8-25.6-29.5-45.2-29.5s-37.3,11.7-45.2,29.5h-21.1l-41.2-41.2h215.1l-41.3,41.2ZM530.1,430.5v-141l-44.2-44.2,48.4-48.4,163,163.1-163,163-48.3-48.4,44.1-44.1Z"/>
-  </g>
-</svg>
--- a/res/pictograms/TRI_small.svg
+++ b/res/pictograms/TRI_small.svg
--- a/res/pictograms/TTE_small.svg
+++ b/res/pictograms/TTE_small.svg
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <g>
-      <path class="cls-3" d="M642.4,66.4l-100.6,100.5,11.3,11.3,100.6-100.5-11.3-11.3Z"/>
-      <path class="cls-3" d="M49.8,169.8c12.9,12.9,29,20.8,45.8,23.6l97.9-97.9c-2.8-16.7-10.7-32.8-23.6-45.7l-16.2-16.2C120.5.5,66.7.5,33.6,33.6s-33.2,86.9,0,120l16.2,16.2ZM66.9,77.4c14.2,0,25.7,11.5,25.7,25.7s-11.5,25.7-25.7,25.7-25.7-11.5-25.7-25.7c0-14.1,11.5-25.7,25.7-25.7Z"/>
-      <path class="cls-3" d="M194.4,117.2l-77.1,77.1c8.6-.8,17.2-2.8,25.3-6.2,7.5-3,16.2-1.1,21.9,4.7l42.2,42.2c4.4,4.4,11.4,4.4,15.8,0l12.4-12.4c4.4-4.4,4.4-11.4,0-15.8l-42.1-42.1c-5.8-5.8-7.7-14.4-4.7-22,3.5-8.3,5.6-16.8,6.3-25.5Z"/>
-      <path class="cls-3" d="M166.9,541.9l-100.6,100.5,11.3,11.3,100.6-100.5-11.3-11.3Z"/>
-      <path class="cls-3" d="M525.6,602.8l77.1-77.1c-8.6.8-17.2,2.8-25.3,6.2-7.5,3-16.2,1.1-21.9-4.7l-42.2-42.2c-4.4-4.4-11.4-4.4-15.8,0l-12.4,12.4c-4.4,4.4-4.4,11.4,0,15.8l42.1,42.1c5.8,5.8,7.7,14.4,4.7,22-3.5,8.3-5.5,16.8-6.3,25.5Z"/>
-      <path class="cls-3" d="M670.2,550.2c-12.9-12.9-29-20.8-45.8-23.6l-97.9,97.9c2.8,16.7,10.7,32.8,23.6,45.7l16.2,16.2c33.2,33.1,87,33.1,120.1,0,33.2-33.1,33.2-86.9,0-120l-16.2-16.2ZM653.1,642.6c-14.2,0-25.7-11.5-25.7-25.7s11.5-25.7,25.7-25.7,25.7,11.5,25.7,25.7c.1,14.1-11.5,25.7-25.7,25.7Z"/>
-      <path class="cls-3" d="M431,697.4l-182.5-182.5,129.5-129.8,102.5,102.8,7.1-7.1-102.5-102.8h0l129.5-129.8,182.8,182.8-84.4,84.4c6.8.2,13.5,1.1,20,2.7l87-87.1-194.1-194.1,32.3-32.4-43.1-43.1-32.3,32.4L289,0l-86.9,86.9c1.6,6.5,2.5,13.2,2.7,19.9l84.2-84.2,182.5,182.5-129.5,129.8-102.5-102.8-7.1,7.1,102.6,102.8h0l-129.5,129.8L22.6,289l84.4-84.4c-6.8-.2-13.5-1.1-20-2.7L0,289l194.2,194.2-32.3,32.4,43.1,43.1,32.3-32.4,193.7,193.7,86.9-86.9c-1.6-6.5-2.5-13.2-2.7-19.9l-84.2,84.2ZM515.1,175.6l28.9,28.9-25.3,25.3-28.9-28.9,25.3-25.3ZM478.6,212.2l28.9,28.9-25.6,25.7-28.9-28.9,25.6-25.7ZM445.9,245l28.9,28.9-27.6,27.6-28.9-28.9,27.6-27.6ZM411.3,279.7l28.9,28.9-27.6,27.6-28.9-28.9,27.6-27.6ZM376.6,314.4l28.9,28.9-27.5,27.6-28.9-28.9,27.5-27.6ZM342,349.1l28.9,28.9-27.5,27.6-28.9-28.9,27.5-27.6ZM307.4,383.8l28.9,28.9-27.6,27.6-28.9-28.9,27.6-27.6ZM272.8,418.5l28.9,28.9-27.6,27.6-28.9-28.9,27.6-27.6ZM204.9,544.5l-28.9-29,25.3-25.3,28.9,28.9-25.3,25.4ZM212.5,478.9l25.6-25.7,28.9,28.9-25.6,25.7-28.9-28.9Z"/>
-    </g>
-  </g>
-</svg>
--- a/res/pictograms/VBV_small.svg
+++ b/res/pictograms/VBV_small.svg
@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <g>
-      <path class="cls-3" d="M131.1,384.1c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5c0,2.8,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M131.1,318.2c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5c0,2.8,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M135.8,420.2c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M166.4,379.6c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M161.5,348.6c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M213.4,299.5c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M189.4,351.3c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M163.4,322.7c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M146.3,272.6c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M175.3,416.4c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M178.6,282c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M115.9,344.5c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M202.5,256.3c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M319.8,216.1c59.7,0,108.1-48.4,108.1-108.1S379.5,0,319.8,0s-108.1,48.4-108.1,108.1,48.4,108,108.1,108ZM319.8,206.1c-9.8,0-19.3-1.5-28.3-4.2,15.3-19.4,30.9-49.2,33.1-90.7,14.3-7.3,28.1-11.8,40.9-14.3h0c.2.8,13.3,59.5-25.4,107-6.5,1.5-13.3,2.2-20.3,2.2ZM417.8,108.1c0,41.3-25.7,76.7-61.9,91.1,29.8-46.1,20.8-97.3,19.5-103.7,15.8-2,30-1.1,41.7.9.5,3.7.7,7.7.7,11.7ZM415.2,85.6c-24.5-3.5-58-2.2-95.1,16.7-13.4-8.7-24.2-18.4-32.8-28.3h0c.5-.5,44.7-41.1,105.2-31.5,11,12,18.9,26.8,22.7,43.1ZM319.8,10c22.9,0,44,7.9,60.7,21.1-54.8-2.8-94.6,30.7-99.5,35-9.6-12.7-15.9-25.4-20.1-36.5,16.4-12.3,36.8-19.6,58.9-19.6ZM252.6,36.7c9.2,22.9,27.1,51.3,62,74-.8,16-3.8,30.2-8.1,42.6h-.1c-.7-.2-58-18.2-79.9-75.5,5.2-15.9,14.3-29.9,26.1-41.1ZM222.8,93.8c25,48.9,73.9,66.7,80.1,68.8-6.2,14.7-14.1,26.5-21.6,35.7-35-15-59.6-49.8-59.6-90.2,0-4.9.4-9.6,1.1-14.3Z"/>
-      <path class="cls-3" d="M241,313.1c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M232.6,343.7c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M211.8,379.9c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M604.1,385.5c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M487.4,386.3c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M105.4,399c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M479,416.9c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M530.6,378.7c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M506.6,430.5c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M508.2,350.1c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M400.2,503.9c-59.7,0-108.1,48.4-108.1,108.1s48.4,108,108.1,108,108.1-48.4,108.1-108.1-48.4-108-108.1-108ZM400.2,513.9c9.8,0,19.3,1.5,28.3,4.2-15.3,19.4-30.9,49.2-33.1,90.7-14.3,7.3-28.1,11.8-40.9,14.3h0c-.2-.8-13.3-59.5,25.4-107,6.5-1.5,13.3-2.2,20.3-2.2ZM302.2,611.9c0-41.3,25.7-76.7,61.9-91.1-29.8,46.1-20.8,97.3-19.5,103.7-15.8,2-30,1.1-41.7-.9-.5-3.7-.7-7.7-.7-11.7ZM304.8,634.4c24.5,3.5,58,2.2,95.1-16.7,13.4,8.7,24.2,18.4,32.8,28.3h0c-.5.5-44.7,41.1-105.2,31.5-11-12-18.9-26.8-22.7-43.1ZM400.2,710c-22.9,0-44-7.9-60.7-21.1,54.8,2.8,94.6-30.7,99.5-35,9.6,12.7,15.9,25.4,20.1,36.5-16.4,12.3-36.8,19.6-58.9,19.6ZM467.4,683.3c-9.2-22.9-27.1-51.3-62-74,.8-16,3.8-30.2,8.1-42.6h.1c.7.2,58,18.2,79.9,75.5-5.2,15.9-14.3,29.9-26.1,41.1ZM497.2,626.2c-25-48.9-73.9-66.7-80.1-68.8,6.2-14.7,14.1-26.5,21.6-35.7,35,15,59.6,49.8,59.6,90.2,0,4.9-.4,9.6-1.1,14.3Z"/>
-      <path class="cls-3" d="M643.8,365.8c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M634.5,396.6c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M614.6,331c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M720,360l-127-127-7.1,7.1,120,120-167.3,167.2-127-127L691.8,120l-91.8-91.8-280.2,280.2L77.7,66.3l-11.4,11.4,108,108L0,360l127,127,7.1-7.1L14.1,359.9l167.3-167.3,127,127L28.2,600l91.8,91.8,280.2-280.2,242.1,242.1,11.3-11.3-108-108,174.4-174.4ZM402.4,395.3l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM127.1,543.5l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM148.3,578.8l-28.3,28.2-28.2-28.2,28.2-28.2,28.3,28.2ZM162.4,508.2l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM197.7,472.9l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM233,437.7l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM268.3,402.4l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM303.6,367.1l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM338.8,331.8l28.2-28.2,28.2,28.2-28.1,28.2-28.3-28.2ZM571.8,155.3l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM550.6,120l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM536.5,190.6l-28.2,28.2-28.3-28.2,28.2-28.2,28.3,28.2ZM501.2,225.9l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM465.9,261.2l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM430.6,296.5l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM437.7,360l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM472.9,324.7l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM508.2,289.4l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM543.5,254.1l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM578.8,218.8l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM614.1,183.5l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM677.6,120l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM642.3,84.7l-28.2,28.3-28.2-28.2,28.2-28.2,28.2,28.1ZM42.4,600L600,42.4l7.1,7.1L49.5,607l-7.1-7ZM56.5,614.1l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM120,677.6l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM155.3,642.3l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM190.6,607l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM225.9,571.7l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM261.2,536.5l-28.2-28.3,28.2-28.2,28.2,28.2-28.2,28.3ZM296.5,501.2l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM331.8,465.9l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM367.1,430.6l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2Z"/>
-      <path class="cls-3" d="M517.5,473.7c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M558.5,381.4c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M588.9,345.9c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M584.2,309.8c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.3,5,5,5Z"/>
-      <path class="cls-3" d="M76.2,364.2c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M85.5,333.4c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M588.9,411.8c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M553.6,350.4c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M573.7,457.4c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M556.6,407.3c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M541.4,448c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-      <path class="cls-3" d="M544.7,313.6c2.8,0,5-2.2,5-5s-2.2-5-5-5-5,2.2-5,5,2.2,5,5,5Z"/>
-    </g>
-  </g>
-</svg>
--- a/res/pictograms/VVO_small.svg
+++ b/res/pictograms/VVO_small.svg
@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <g>
-      <path class="cls-3" d="M720,360l-127-127-7.1,7.1,32.6,32.6-167.3,167.2-39.6-39.6L691.8,120l-91.8-91.8-280.2,280.2L77.7,66.3l-11.4,11.4,108,108L0,360l127,127,7.1-7.1-32.6-32.6,167.3-167.3,39.6,39.6L28.2,599.9l91.8,91.8,280.2-280.2,242.1,242.1,11.3-11.3-108-108,174.4-174.3ZM94.5,440.3L14.1,360l167.3-167.3,80.3,80.3-167.2,167.3ZM402.4,395.3l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM127.1,543.5l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM148.3,578.8l-28.3,28.2-28.2-28.2,28.2-28.2,28.3,28.2ZM162.4,508.2l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM197.7,472.9l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM233,437.6l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM268.3,402.3l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM303.6,367.1l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM338.8,331.8l28.2-28.2,28.2,28.2-28.1,28.2-28.3-28.2ZM571.8,155.3l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM550.6,120l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM536.5,190.6l-28.2,28.2-28.3-28.2,28.2-28.2,28.3,28.2ZM501.2,225.9l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM465.9,261.2l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM430.6,296.5l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM437.7,360l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM472.9,324.7l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM508.2,289.4l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM543.5,254.1l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM578.8,218.8l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM614.1,183.5l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM677.6,120l-28.2,28.2-28.2-28.2,28.2-28.2,28.2,28.2ZM642.3,84.7l-28.2,28.3-28.2-28.2,28.2-28.2,28.2,28.1ZM42.4,599.9L600,42.4l7.1,7.1L49.5,607l-7.1-7.1ZM56.5,614.1l28.2-28.2,28.2,28.2-28.2,28.2-28.2-28.2ZM120,677.6l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM155.3,642.3l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM190.6,607l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM225.9,571.7l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM261.2,536.4l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM296.5,501.1l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM331.8,465.9l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM367.1,430.6l-28.2-28.2,28.2-28.2,28.2,28.2-28.2,28.2ZM458.3,446.9l167.3-167.3,80.3,80.3-167.3,167.4-80.3-80.4Z"/>
-      <path class="cls-3" d="M319.8,216.1c59.7,0,108.1-48.4,108.1-108.1S379.5,0,319.8,0s-108.1,48.4-108.1,108.1,48.4,108,108.1,108ZM411.2,72.7c4.3,11,6.6,22.9,6.6,35.3,0,52.5-41.6,95.6-93.5,97.9-10.7-4.2-34-16.5-36.6-43.8-1.4-15.4,3.8-29.6,8.8-39.3,42.8,7.3,76.8-13.5,89.6-32.2,9.6-13.9,19.3-17.3,25.1-17.9ZM319.8,10c25.4,0,48.6,9.7,66.1,25.7-10.9-.4-27.2,4-45.3,25.4-32.7,38.6-73.8,30.5-73.8,30.5-6.4-32.3-14.1-44.8-19.4-49.6,17.9-19.6,43.7-32,72.4-32ZM223.6,89c13.9,5.8,31,37.6,34.7,44.7-6.5,11-11.4,26.8-5.2,46.1-19.3-17.9-31.4-43.5-31.4-71.8,0-6.5.7-12.8,1.9-19Z"/>
-      <path class="cls-3" d="M400.2,503.9c-59.7,0-108.1,48.4-108.1,108.1s48.4,108.1,108.1,108.1,108.1-48.4,108.1-108.1c0-59.7-48.4-108.1-108.1-108.1ZM308.8,647.3c-4.3-11-6.6-22.9-6.6-35.3,0-52.5,41.6-95.6,93.5-97.9,10.7,4.2,34,16.5,36.6,43.8,1.4,15.4-3.8,29.6-8.8,39.3-42.8-7.3-76.8,13.5-89.6,32.2-9.6,13.9-19.3,17.3-25.1,17.9ZM400.2,710c-25.4,0-48.6-9.7-66.1-25.7,10.9.4,27.2-4,45.3-25.4,32.7-38.6,73.8-30.5,73.8-30.5,6.4,32.3,14.1,44.8,19.4,49.6-17.9,19.6-43.7,32-72.4,32ZM496.4,631c-13.9-5.8-31-37.6-34.7-44.7,6.5-11,11.4-26.8,5.2-46.1,19.3,17.9,31.4,43.5,31.4,71.8s-.7,12.8-1.9,19Z"/>
-    </g>
-  </g>
-</svg>
--- a/res/pictograms/WLF_small.svg
+++ b/res/pictograms/WLF_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M44,633.1l-7.1,7.1,10.9,10.8L0,698.8l21.2,21.2,47.8-47.8,10.9,10.9,7.1-7.1-43-42.9ZM21.2,705.9l-7.1-7.1,40.7-40.7,7.1,7.1-40.7,40.7ZM683.1,79.8l-10.9-10.8,47.8-47.8-21.2-21.2-47.8,47.8-10.9-10.9-7,7.1,42.9,42.9,7.1-7.1ZM658.1,54.8l40.7-40.7,7.1,7.1-40.7,40.7-7.1-7.1ZM82.1,492.8l145,145-22.6,22.6-145-145,22.6-22.6ZM52.4,522.6l145,145-22.6,22.6L29.8,545.2l22.6-22.6ZM22.6,552.3l145,145-22.5,22.7L0,574.9l22.6-22.6ZM572.7,190.2l7.1-7.1-42.9-42.9-7.1,7.1,10.9,10.9-180.7,180.6-180.6-180.7,10.9-10.9-7.1-7.1-42.9,42.9,7.1,7.1,10.9-10.9,180.5,180.8-180.7,180.6-10.9-10.9-7.1,7.1,42.9,42.9,7.1-7.1-10.9-10.9,180.8-180.5,180.6,180.6-10.9,10.9,7.1,7.1,42.9-42.9-7.1-7.1-10.9,10.9-180.5-180.7,180.6-180.6,10.9,10.8ZM172.3,554.8l-7.1-7.1,180.6-180.6,7.1,7.1-180.6,180.6ZM547.7,554.8L165.2,172.3l7.1-7.1,382.5,382.5-7.1,7.1ZM374.1,352.9l-7.1-7.1,180.6-180.6,7.1,7.1-180.6,180.6ZM637.9,227.2l-145-145,22.6-22.6,145,145-22.6,22.6ZM667.6,197.4l-145-145,22.6-22.6,145,145-22.6,22.6ZM697.4,167.7L552.4,22.7l22.5-22.7,145,145-22.5,22.7ZM36.9,79.8l7.1,7.1,42.9-42.9-7.1-7.1-10.8,10.9L21.2,0,0,21.2l47.8,47.8-10.9,10.8ZM14.1,21.2l7.1-7.1,40.7,40.7-7.1,7.1L14.1,21.2ZM683.1,640.2l-7.1-7.1-42.9,42.9,7.1,7.1,10.9-10.9,47.7,47.8,21.2-21.2-47.8-47.8,10.9-10.8ZM705.9,698.8l-7.1,7.1-40.7-40.7,7.1-7.1,40.7,40.7ZM59.5,204.6L204.5,59.6l22.6,22.6L82.1,227.2l-22.6-22.6ZM29.8,174.8L174.8,29.8l22.6,22.6L52.4,197.4l-22.6-22.6ZM0,145.1L145,.1l22.6,22.6L22.6,167.7,0,145.1ZM660.5,515.4l-145,145-22.6-22.6,145-145,22.6,22.6ZM690.2,545.2l-145,145-22.6-22.6,145-145,22.6,22.6ZM720,574.9l-145,145-22.6-22.6,145-145,22.6,22.6Z"/>
-  </g>
-</svg>
--- a/res/pictograms/WPO_small.svg
+++ b/res/pictograms/WPO_small.svg
--- a/res/pictograms/WRE_small.svg
+++ b/res/pictograms/WRE_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M492.6,467.2c39.5-48.8,48.1-114.2,25.8-170.2,10.9-10.3,14-15.4,18.5-25.8.4-.8.7-1.7,1.1-2.6,1-2.2,3.5-5,7.3-8.1h0c40.1,74.6,32,168.4-24.4,235.2l-28.4-28.5ZM486.2,147.4l90.7-58.9,19.5,19.5-23,23c-2.1,2.1-3.2,4.9-3.2,7.8s1.2,5.7,3.2,7.8c2.1,2.1,4.9,3.2,7.8,3.2s5.7-1.2,7.8-3.2l23-23.1,19.5,19.5-58.9,90.7-2.8,1.2c-20.7,8.8-36.8,20.3-40.8,29.4-.4,1-.8,1.8-1.2,2.7-4.9,11.1-6.9,14.7-25.8,31.2-13.5,11.8-28.7,23.7-33.3,26.7l-9.7,6.4-4.8-10.6c-6-13.1-12.7-23-21.3-31.5l-2.3-2.3c-8.4-8.5-18.4-15.2-31.4-21.2l-10.6-4.8,6.4-9.7c3-4.5,14.9-19.7,26.7-33.3,16.5-18.8,20.1-20.9,31.2-25.8.8-.4,1.7-.8,2.7-1.2,9.1-4.1,20.6-20.1,29.4-40.8l1.2-2.7ZM435.3,277.6l13.6-13.6c-10-9.3-21.3-16.9-33.7-22.7-5.9,7.3-10.3,13.2-11.8,15.4,13.3,6.1,23.5,12.9,31.9,20.9ZM478.7,304.8c-5.8-12.4-13.4-23.7-22.7-33.7l-13.6,13.6c8,8.4,14.8,18.6,20.9,31.9,2.2-1.5,8.2-6,15.4-11.8ZM494.2,154.1c-6.5,15.3-19.3,39.3-34.5,46.1-11.9,5.3-13.3,4.9-30.4,24.4-1.2,1.3-2.3,2.7-3.5,4,12.6,6.3,24.2,14.4,34.5,24.1l26.4-26.4,7.1,7.1-26.4,26.4c9.7,10.3,17.7,21.9,24.1,34.5,1.4-1.2,2.7-2.3,4-3.5,19.5-17.1,19.1-18.5,24.4-30.4,6.8-15.2,30.7-28,46.1-34.5l52.8-81.3-6.7-6.7-16,16c-4.1,4.1-9.5,6.2-14.9,6.2s-10.8-2.1-14.9-6.2c-8.2-8.2-8.2-21.6,0-29.8l16-16-6.7-6.7-81.4,52.7ZM448.9,183c.8-.4,1.7-.7,2.6-1.1,2.2-1,5-3.5,8.1-7.3h0c-74.6-40.2-168.3-32.1-235.2,24.4l28.4,28.4c48.8-39.5,114.2-48.1,170.2-25.8,10.4-10.9,15.5-14,25.9-18.6ZM720,360l-131.8-131.8-8.9,13.6h0l118.2,118.2-156,156,11.3,11.3,167.3-167.3ZM0,360l131.8,131.8,8.9-13.6h.1l-118.2-118.2,156-156-11.3-11.3L0,360ZM233.8,572.6l-90.7,58.9-19.5-19.5,23-23c2.1-2.1,3.2-4.9,3.2-7.8s-1.2-5.7-3.2-7.8c-2.1-2.1-4.9-3.2-7.8-3.2s-5.7,1.1-7.8,3.2l-23,23.1-19.5-19.5,58.9-90.7,2.8-1.2c20.7-8.8,36.8-20.3,40.8-29.4.4-1,.8-1.8,1.2-2.7,4.9-11.1,6.9-14.7,25.8-31.2,13.5-11.8,28.7-23.7,33.3-26.7l9.7-6.4,4.8,10.6c6,13.1,12.7,23,21.3,31.5l2.3,2.3c8.4,8.5,18.4,15.2,31.4,21.2l10.6,4.8-6.4,9.7c-3,4.5-14.9,19.7-26.7,33.3-16.5,18.8-20.1,20.9-31.2,25.8-.8.4-1.7.8-2.7,1.2-9.1,4.1-20.6,20.1-29.4,40.8l-1.2,2.7ZM284.7,442.4l-13.7,13.7c10,9.3,21.3,16.9,33.7,22.7,5.9-7.3,10.3-13.2,11.8-15.4-13.2-6.2-23.4-13-31.8-21ZM241.3,415.2c5.8,12.4,13.4,23.7,22.7,33.7l13.6-13.6c-8-8.4-14.8-18.6-20.9-31.9-2.2,1.5-8.2,6-15.4,11.8ZM225.8,565.9c6.5-15.3,19.3-39.3,34.5-46.1,11.9-5.3,13.3-4.9,30.4-24.4,1.2-1.3,2.3-2.7,3.5-4-12.6-6.3-24.2-14.4-34.5-24.1l-26.4,26.4-7.1-7.1,26.4-26.4c-9.7-10.3-17.7-21.9-24.1-34.5-1.4,1.2-2.7,2.3-4,3.5-19.5,17.1-19.1,18.5-24.4,30.4-6.8,15.2-30.7,28-46.1,34.5l-52.8,81.3,6.7,6.7,16-16c4.1-4.1,9.5-6.2,14.9-6.2s10.8,2.1,14.9,6.2c8.2,8.2,8.2,21.6,0,29.8l-16,16,6.7,6.7,81.4-52.7ZM360,697.4l-118.1-118.1h0c0,0-13.6,9-13.6,9l131.7,131.7,167.3-167.3-11.3-11.3-156,156ZM360,22.6l118.1,118.1h0c0-.1,13.6-9,13.6-9L360,0l-167.3,167.3,11.3,11.3L360,22.6ZM199,224.4c-56.4,66.9-64.6,160.6-24.4,235.2h.1c3.8-3.1,6.3-5.9,7.3-8.1.4-.9.8-1.8,1.1-2.6,4.6-10.4,7.6-15.5,18.5-25.8-22.3-56-13.7-121.5,25.8-170.2l-28.4-28.5ZM271.1,537c-.8.4-1.7.7-2.6,1.1-2.2,1-5,3.5-8.1,7.3h0c74.6,40.2,168.3,32.1,235.2-24.3l-28.4-28.4c-48.7,39.5-114.2,48.1-170.2,25.8-10.4,10.8-15.5,13.9-25.9,18.5ZM391.1,379.8l262.6,262.6-11.3,11.3-262.6-262.6c-14.3,9.1-33.4,7.5-45.9-5s-14.1-31.6-5-45.9L66.3,77.7l11.3-11.3,262.6,262.6c14.3-9.1,33.4-7.5,45.9,5s14.1,31.5,5,45.8ZM347.5,336.2l36.3,36.3c5.3-10.1,3.7-23-4.8-31.5s-21.3-10.1-31.5-4.8ZM372.5,383.8l-36.3-36.3c-5.3,10.1-3.7,23,4.8,31.5s21.3,10.1,31.5,4.8Z"/>
-  </g>
-</svg>
--- a/res/pictograms/WRG_small.svg
+++ b/res/pictograms/WRG_small.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 720 720">
-  <defs>
-    <style>
-      .cls-1 {
-        clip-path: url(#clippath);
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-3 {
-        fill: #000;
-      }
-    </style>
-    <clipPath id="clippath">
-      <rect class="cls-2" width="720" height="720"/>
-    </clipPath>
-  </defs>
-  <g class="cls-1">
-    <path class="cls-3" d="M492.6,467.2c39.5-48.8,48.1-114.2,25.8-170.2,10.9-10.3,14-15.4,18.5-25.8.4-.8.7-1.7,1.1-2.6,1-2.2,3.5-5,7.3-8.1h0c40.1,74.6,32,168.4-24.4,235.2l-28.4-28.5ZM486.2,147.4l90.7-58.9,19.5,19.5-23,23c-2.1,2.1-3.2,4.9-3.2,7.8s1.2,5.7,3.2,7.8c2.1,2.1,4.9,3.2,7.8,3.2s5.7-1.2,7.8-3.2l23-23.1,19.5,19.5-58.9,90.7-2.8,1.2c-20.7,8.8-36.8,20.3-40.8,29.4-.4,1-.8,1.8-1.2,2.7-4.9,11.1-6.9,14.7-25.8,31.2-13.5,11.8-28.7,23.7-33.3,26.7l-9.7,6.4-4.8-10.6c-6-13.1-12.7-23-21.3-31.5l-2.3-2.3c-8.4-8.5-18.4-15.2-31.4-21.2l-10.6-4.8,6.4-9.7c3-4.5,14.9-19.7,26.7-33.3,16.5-18.8,20.1-20.9,31.2-25.8.8-.4,1.7-.8,2.7-1.2,9.1-4.1,20.6-20.1,29.4-40.8l1.2-2.7ZM435.3,277.6l13.6-13.6c-10-9.3-21.3-16.9-33.7-22.7-5.9,7.3-10.3,13.2-11.8,15.4,13.3,6.1,23.5,12.9,31.9,20.9ZM478.7,304.8c-5.8-12.4-13.4-23.7-22.7-33.7l-13.6,13.6c8,8.4,14.8,18.6,20.9,31.9,2.2-1.5,8.2-6,15.4-11.8ZM494.2,154.1c-6.5,15.3-19.3,39.3-34.5,46.1-11.9,5.3-13.3,4.9-30.4,24.4-1.2,1.3-2.3,2.7-3.5,4,12.6,6.3,24.2,14.4,34.5,24.1l26.4-26.4,7.1,7.1-26.4,26.4c9.7,10.3,17.7,21.9,24.1,34.5,1.4-1.2,2.7-2.3,4-3.5,19.5-17.1,19.1-18.5,24.4-30.4,6.8-15.2,30.7-28,46.1-34.5l52.8-81.3-6.7-6.7-16,16c-4.1,4.1-9.5,6.2-14.9,6.2s-10.8-2.1-14.9-6.2c-8.2-8.2-8.2-21.6,0-29.8l16-16-6.7-6.7-81.4,52.7ZM448.9,183c.8-.4,1.7-.7,2.6-1.1,2.2-1,5-3.5,8.1-7.3h0c-74.6-40.2-168.3-32.1-235.2,24.4l28.4,28.4c48.8-39.5,114.2-48.1,170.2-25.8,10.4-10.9,15.5-14,25.9-18.6ZM720,360l-131.8-131.8-8.9,13.6h0l118.2,118.2-156,156,11.3,11.3,167.3-167.3ZM0,360l131.8,131.8,8.9-13.6h.1l-118.2-118.2,156-156-11.3-11.3L0,360ZM233.8,572.6l-90.7,58.9-19.5-19.5,23-23c2.1-2.1,3.2-4.9,3.2-7.8s-1.2-5.7-3.2-7.8c-2.1-2.1-4.9-3.2-7.8-3.2s-5.7,1.1-7.8,3.2l-23,23.1-19.5-19.5,58.9-90.7,2.8-1.2c20.7-8.8,36.8-20.3,40.8-29.4.4-1,.8-1.8,1.2-2.7,4.9-11.1,6.9-14.7,25.8-31.2,13.5-11.8,28.7-23.7,33.3-26.7l9.7-6.4,4.8,10.6c6,13.1,12.7,23,21.3,31.5l2.3,2.3c8.4,8.5,18.4,15.2,31.4,21.2l10.6,4.8-6.4,9.7c-3,4.5-14.9,19.7-26.7,33.3-16.5,18.8-20.1,20.9-31.2,25.8-.8.4-1.7.8-2.7,1.2-9.1,4.1-20.6,20.1-29.4,40.8l-1.2,2.7ZM284.7,442.4l-13.7,13.7c10,9.3,21.3,16.9,33.7,22.7,5.9-7.3,10.3-13.2,11.8-15.4-13.2-6.2-23.4-13-31.8-21ZM241.3,415.2c5.8,12.4,13.4,23.7,22.7,33.7l13.6-13.6c-8-8.4-14.8-18.6-20.9-31.9-2.2,1.5-8.2,6-15.4,11.8ZM225.8,565.9c6.5-15.3,19.3-39.3,34.5-46.1,11.9-5.3,13.3-4.9,30.4-24.4,1.2-1.3,2.3-2.7,3.5-4-12.6-6.3-24.2-14.4-34.5-24.1l-26.4,26.4-7.1-7.1,26.4-26.4c-9.7-10.3-17.7-21.9-24.1-34.5-1.4,1.2-2.7,2.3-4,3.5-19.5,17.1-19.1,18.5-24.4,30.4-6.8,15.2-30.7,28-46.1,34.5l-52.8,81.3,6.7,6.7,16-16c4.1-4.1,9.5-6.2,14.9-6.2s10.8,2.1,14.9,6.2c8.2,8.2,8.2,21.6,0,29.8l-16,16,6.7,6.7,81.4-52.7ZM360,697.4l-118.1-118.1h0c0,0-13.6,9-13.6,9l131.7,131.7,167.3-167.3-11.3-11.3-156,156ZM360,22.6l118.1,118.1h0c0-.1,13.6-9,13.6-9L360,0l-167.3,167.3,11.3,11.3L360,22.6ZM199,224.4c-56.4,66.9-64.6,160.6-24.4,235.2h.1c3.8-3.1,6.3-5.9,7.3-8.1.4-.9.8-1.8,1.1-2.6,4.6-10.4,7.6-15.5,18.5-25.8-22.3-56-13.7-121.5,25.8-170.2l-28.4-28.5ZM271.1,537c-.8.4-1.7.7-2.6,1.1-2.2,1-5,3.5-8.1,7.3h0c74.6,40.2,168.3,32.1,235.2-24.3l-28.4-28.4c-48.7,39.5-114.2,48.1-170.2,25.8-10.4,10.8-15.5,13.9-25.9,18.5ZM391.1,379.8l262.6,262.6-11.3,11.3-262.6-262.6c-14.3,9.1-33.4,7.5-45.9-5s-14.1-31.6-5-45.9L66.3,77.7l11.3-11.3,262.6,262.6c14.3-9.1,33.4-7.5,45.9,5s14.1,31.5,5,45.8ZM347.5,336.2l36.3,36.3c5.3-10.1,3.7-23-4.8-31.5s-21.3-10.1-31.5-4.8ZM372.5,383.8l-36.3-36.3c-5.3,10.1-3.7,23,4.8,31.5s21.3,10.1,31.5,4.8Z"/>
-  </g>
-</svg>
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@ -1,44 +0,0 @@
-#include <QGuiApplication>
-#include <QQmlEngine>
-#include <QQmlContext>
-#include <QQmlComponent>
-
-// networking
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrl>
-#include <QUrlQuery>
-
-// json parsing
-#include <QJsonValue>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QVariantMap>
-#include <QJsonArray>
-
-// console output
-#include <QDebug>
-// #include <iostream>
-#include "../model/FilterModel.h"
-#include "../model/SportModel.h"
-
-int main(int argc, char *argv[])
-{
-    QGuiApplication app(argc, argv);
-
-    QQmlEngine engine;
-    QQmlContext *objectContext = new QQmlContext(engine.rootContext());
-
-    SportModel model;
-    model.request("ARC");
-    FilterModel filter;
-    filter.setSourceModel(&model);
-    objectContext->setContextProperty("sports", &model);
-    objectContext->setContextProperty("filter", &filter);
-
-    QQmlComponent component(&engine, "qrc:/qt/qml/itat/res/gui/application.qml");
-    QObject *object = component.create(objectContext);
-
-    return app.exec();
-}
--- a/src/model/Competitor.cpp
+++ b/src/model/Competitor.cpp
@ -1,126 +0,0 @@
-
-#include "Competitor.h"
-
-/**
- * Reads certain properties from a competitor json object.
- * These are: code, name, noc, results
- *
- * For further information on 'results' see [Competitor::setResult].
- *
- * Does not set the amounts of medals. For this, call [Competitor::setMedals].
- *
- * @param competitor The competitor as a QJsonObject.
- * @return True if successful.
- */
-bool Competitor::setCompetitor(const QJsonObject &competitor) {
-    if (!competitor.contains("code")
-        || !competitor.contains("name")
-        || !competitor.contains("noc")) {
-        return false;
-    }
-
-    setCode(competitor["code"].toInt());
-    setName(competitor["name"].toString());
-    setNOC(competitor["noc"].toString());
-
-    if (!competitor.contains("results")) return false;
-    QJsonObject results = competitor["results"].toObject();
-    return setResults(results);
-}
-
-/**
- * Copies all values of a given competitor.
- *
- * @param competitor The competitor to copy.
- */
-void Competitor::setCompetitor(const Competitor &competitor) {
-    setCode(competitor.m_code);
-    setName(competitor.m_name);
-    setNOC(competitor.m_noc);
-    setMark(competitor.m_mark);
-    setMedalType(competitor.m_medalType);
-    setStatistic(competitor.m_statistic);
-    setGold(competitor.m_gold);
-    setSilver(competitor.m_silver);
-    setBronze(competitor.m_bronze);
-}
-
-/**
- * Replaces/sets the results of a competitor.
- *
- * @param results The results of the competitor.
- * @return True, if successful.
- */
-bool Competitor::setResults(const QJsonObject &results) {
-    if (!results.contains("mark")
-        || !results.contains("medalType")) {
-        return false;
-    }
-
-    setMark(results["mark"].toString());
-    setMedalType(results["medalType"].toString());
-
-    return true;
-}
-
-/**
- * Replaces/sets the won medals of a competitor.
- *
- * @param medals The won medals with their amount.
- * @return True, if successful.
- */
-bool Competitor::setMedals(const map<QString, int> &medals) {
-    if (medals.find("ME_GOLD") == medals.end()
-        || medals.find("ME_SILVER") == medals.end()
-        || medals.find("ME_BRONZE") == medals.end()) return false;
-
-    setGold(medals.find("ME_GOLD")->second);
-    setSilver(medals.find("ME_SILVER")->second);
-    setBronze(medals.find("ME_BRONZE")->second);
-
-    return true;
-}
-
-/**
- * Static compare method, which can compare the result times or points of two competitors.
- * Returns true, if the left competitor (lComp) got a real lesser score than the right competitor (rComp).
- *
- * @param lComp First competitor to compare.
- * @param rComp Second competitor to compare.
- * @return True, if the second competitor got a higher score.
- */
-bool Competitor::compareMark(Competitor lComp, Competitor rComp) {
-    QString l = lComp.mark();
-    QString r = rComp.mark();
-
-    // check if values are numerical (-> not time values)
-    if (!l.contains(":") || !r.contains(":")) {
-        return l.toFloat() < r.toFloat();
-    }
-
-    // compare time values if not numerical
-    QString lTime(""), rTime("");
-
-    for (QChar c : l) if (c.isDigit()) lTime.append(c);
-    for (QChar c : r) if (c.isDigit()) rTime.append(c);
-
-    return lTime.compare(rTime) < 0;
-}
-
-/**
- * Static compare method, which can compare the amount of medals of two competitors.
- * Gold has the highest priority, then m_silver and finally m_bronze.
- *
- * @param lComp First competitor to compare.
- * @param rComp Second competitor to compare.
- * @return True, if the second competitor got more or higher medals.
- */
-bool Competitor::compareMedals(Competitor lComp, Competitor rComp) {
-    // create difference between medal amounts
-    int gold = lComp.gold() - rComp.gold();
-    int silver = lComp.silver() - rComp.silver();
-    int bronze = lComp.bronze() - rComp.bronze();
-
-    // compare medal differences
-    return gold < 0 || (gold == 0 && (silver < 0 || (silver == 0 && bronze < 0)));
-}
--- a/src/model/Competitor.h
+++ b/src/model/Competitor.h
@ -1,95 +0,0 @@
-
-#pragma once
-
-#include <QString>
-#include <QMap>
-#include <QJsonObject>
-#include <QObject>
-#include <qqml.h>
-
-
-using namespace std;
-
-class Competitor : public QObject {
-
-    Q_OBJECT
-
-    Q_PROPERTY(int code READ code NOTIFY codeChanged)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString noc READ noc NOTIFY nocChanged)
-
-    // results in a certain event/category
-    Q_PROPERTY(QString mark READ mark NOTIFY markChanged)
-    Q_PROPERTY(QString medalType READ medalType NOTIFY medalTypeChanged)
-    Q_PROPERTY(QString statistic READ statistic NOTIFY statisticChanged)
-
-    // medal amounts in the whole discipline
-    Q_PROPERTY(int gold READ gold NOTIFY goldChanged)
-    Q_PROPERTY(int silver READ silver NOTIFY silverChanged)
-    Q_PROPERTY(int bronze READ bronze NOTIFY bronzeChanged)
-
-public:
-    explicit Competitor(QObject *parent) : QObject(parent) {}
-
-    // getter
-    int code() const { return this->m_code; }
-    QString name() const { return this->m_name; }
-    QString noc() const { return this->m_noc; }
-    QString mark() const { return this->m_mark; }
-    QString medalType() const { return this->m_medalType; }
-    QString statistic() const { return this->m_statistic; }
-    int gold() const { return this->m_gold; }
-    int silver() const { return this->m_silver; }
-    int bronze() const { return this->m_bronze; }
-
-    // setter
-    void setCode(int code) { this->m_code = code; }
-    void setName(QString name) { this->m_name = name; }
-    void setNOC(QString noc) { this->m_noc = noc; }
-    void setMark(QString mark) { this->m_mark = mark; }
-    void setMedalType(QString medalType) { this->m_medalType = medalType; }
-    void setStatistic(QString stat) { this->m_statistic = stat; }
-    void setGold(int gold) { this->m_gold = gold; }
-    void setSilver(int silver) { this->m_silver = silver; }
-    void setBronze(int bronze) { this->m_bronze = bronze; }
-
-    bool setResults(const QJsonObject &results);
-    bool setMedals(const map<QString, int> &medals);
-
-    bool setCompetitor(const QJsonObject &competitor);
-    void setCompetitor(const Competitor &competitor);
-
-    static bool compareName(Competitor lComp, Competitor rComp) {
-        return lComp.m_name.compare(rComp.m_name) < 0;
-    }
-    static bool compareNOC(Competitor lComp, Competitor rComp) {
-        return lComp.m_noc.compare(rComp.m_noc) < 0;
-    }
-    static bool compareMark(Competitor lComp, Competitor rComp);
-    static bool compareMedals(Competitor lComp, Competitor rComp);
-
-
-signals:
-    void codeChanged();
-    void nameChanged();
-    void nocChanged();
-    void markChanged();
-    void medalTypeChanged();
-    void statisticChanged();
-    void goldChanged();
-    void silverChanged();
-    void bronzeChanged();
-
-private:
-    int m_code;
-    QString m_name;
-    QString m_noc;
-
-    QString m_mark;
-    QString m_medalType;
-    QString m_statistic;
-
-    int m_gold;
-    int m_silver;
-    int m_bronze;
-};
--- a/src/model/EventInfo.cpp
+++ b/src/model/EventInfo.cpp
@ -1,21 +0,0 @@
-#include "EventInfo.h"
-
-EventInfo::EventInfo(QObject *parent) : QObject(parent) {
-}
-
-QString EventInfo::eventName() const {
-  return this->m_eventName;
-}
-
-void EventInfo::setEventName(const QString &newEventName) {
-  m_eventName = newEventName;
-}
-
-QList<Competitor*> EventInfo::competitors() const {
-  return m_competitors;
-}
-
-void EventInfo::setCompetitors(const QList<Competitor*> &newCompetitors) {
-  this->m_competitors = newCompetitors;
-}
-
--- a/src/model/EventInfo.h
+++ b/src/model/EventInfo.h
@ -1,27 +0,0 @@
-#pragma once
-
-#include "Competitor.h"
-#include <QObject>
-#include <QAbstractListModel>
-#include <qqml.h>
-
-class EventInfo : public QObject {
-  Q_OBJECT
-  // QML_ELEMENT
-
-  Q_PROPERTY(QString eventName READ eventName CONSTANT)
-  Q_PROPERTY(QList<Competitor*> competitors READ competitors CONSTANT)
-
-public:
-  explicit EventInfo(QObject *parent = nullptr);
-
-  QString eventName() const;
-  void setEventName(const QString &newEventName);
-
-  QList<Competitor*> competitors() const;
-  void setCompetitors(const QList<Competitor*> &newCompetitors);
-
-private:
-  QString m_eventName;
-  QList<Competitor*> m_competitors;
-};
--- a/src/model/FilterModel.cpp
+++ b/src/model/FilterModel.cpp
@ -1,8 +0,0 @@
-#include "FilterModel.h"
-#include "SportModel.h"
-
-FilterModel::FilterModel(QObject *parent)
-  : QSortFilterProxyModel(parent) {
-    setFilterRole(SportModel::Role::EventName);
-  }
-
--- a/src/model/FilterModel.h
+++ b/src/model/FilterModel.h
@ -1,14 +0,0 @@
-#include <QSortFilterProxyModel>
-
-#pragma once
-
-class FilterModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    FilterModel(QObject *parent = nullptr);
-
-private:
-};
-
--- a/src/model/Sport.h
+++ b/src/model/Sport.h
--- a/src/model/SportModel.cpp
+++ b/src/model/SportModel.cpp
@ -1,390 +0,0 @@
-#include "SportModel.h"
-#include "Competitor.h"
-
-// categories
-#include <QNetworkReply>
-#include <qlogging.h>
-#include <qobject.h>
-#include <set>
-
-// sorting and filtering
-//#include <algorithm>
-#include <regex>
-
-// float to string formatting
-#include <iostream>
-#include <iomanip>
-
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValueRef>
-#include <QString>
-
-namespace {
-  const QString &k_requestUrl = "https://sph-s-api.olympics.com/summer/schedules/api/ENG/schedule/discipline/";
-}
-
-SportModel::SportModel(QObject *parent) : QAbstractListModel(parent) {
-}
-
-int SportModel::rowCount(const QModelIndex &parent) const {
-  Q_UNUSED(parent);
-  return m_sportList.size();
-}
-
-QVariant SportModel::data(const QModelIndex &index, int role) const {
-  if (index.isValid() && index.row() >= 0 && index.row() < m_sportList.size()) {
-    EventInfo *event = m_sportList[index.row()];
-
-    switch ((Role) role) {
-      case EventName:
-        return event->eventName();
-
-      case Competitors:
-        return QVariant::fromValue(event->competitors());
-    }
-  }
-
-  return {};
-}
-
-
-QHash<int, QByteArray> SportModel::roleNames() const {
-  QHash<int, QByteArray> names;
-  names[EventName] = "eventName";
-  names[Competitors] = "competitors";
-
-  return names;
-}
-
-QString SportModel::discipline() const {
-  return m_discipline;
-}
-
-void SportModel::setDiscipline(const QString &discipline) {
-  m_discipline = discipline;
-  disciplineChanged();
-}
-
-
-void SportModel::request(QString discipline) {
-  setDiscipline(discipline);
-  m_reply = m_networkManager.get(QNetworkRequest( k_requestUrl + m_discipline));
-  qDebug() << m_reply;
-  connect(m_reply, &QNetworkReply::finished, this, &SportModel::parseData);
-}
-
-void SportModel::parseData() {
-
-    if (m_reply->error() == QNetworkReply::NoError) {
-      beginResetModel();
-      qDeleteAll(m_sportList);
-      m_sportList.clear();
-
-      QByteArray strReply = m_reply->readAll();
-
-      //parse json
-      // qDebug() << "Response:" << strReply;
-      QJsonDocument jsonDocument = QJsonDocument::fromJson(strReply);
-
-      map<QString, map<QString, int>> medals = getMedalsOfCompetitors();
-
-      QJsonArray sports = jsonDocument["units"].toArray();
-      for (const auto &sport : sports) {
-        QJsonObject entry = sport.toObject();
-
-        EventInfo *event = new EventInfo(this);
-        event->setEventName(entry["eventUnitName"].toString());
-
-        QList<Competitor*> competitors;
-        for (const auto &competitor : entry["competitors"].toArray()) {
-          Competitor *comp = new Competitor(this);
-          comp->setCompetitor(competitor.toObject());
-          if (medals.find(comp->name()) != medals.end()) comp->setMedals(medals.find(comp->name())->second);
-          competitors << comp;
-        }
-        addRelativeToFirst(competitors);
-        event->setCompetitors(competitors);
-
-        qDebug() << entry["eventUnitName"].toString();
-        m_sportList << event;
-      }
-
-      endResetModel();
-    }
-}
-
-// QJsonArray filter function, provide with input array and evaluation function
-QJsonArray filter(QJsonArray input, function<bool (QJsonObject)> eval) {
-    QJsonArray output;
-
-    for (const QJsonValueRef &elemRef :input) {
-        QJsonObject elem = elemRef.toObject();
-        if(eval(elem)) {
-            output.append(elem);
-        }
-    }
-
-    return output;
-}
-
-/**
- * @brief Sport::lastName Reduce the full name to the part that is marked in capital letters (probably last name).
- * @param competitors The competitors of one category.
- */
-void SportModel::lastName(QList<Competitor*> &competitors) {
-    // validate competitors
-    if (competitors.isEmpty()) return;
-
-    for (int i = 0; i < competitors.size(); i++) {
-        Competitor* comp = competitors.value(i);
-        string fullName = comp->name().toUtf8().constData();
-
-        // regex to identify names, written in CAPS
-        regex r("[A-Z']{2,}");
-        smatch m;
-
-        regex_search(fullName, m, r);
-
-        // combine found names again
-        string lastName = "";
-        for (string s : m) lastName = lastName + s + " ";
-
-        // remove last space
-        QString name = QString(lastName.substr(0, lastName.size() - 1).c_str());
-
-        // replace competitor name in list
-        comp->setName(name);
-    }
-}
-
-/**
- * @brief Sport::validateDiscipline Validates the discipline object. Checks for the units attribute.
- * @return True, if discipline contains units.
- */
-bool SportModel::validateDiscipline() {
-    return this->o_discipline.contains("units");
-}
-
-/**
- * @brief Sport::getCategories Reads all possible categories (also called units).
- * @return A set of all category names.
- */
-set<QString> SportModel::getCategories() {
-    set<QString> categoryNames;
-
-    if (!validateDiscipline()) return categoryNames;
-
-    // search in each unit for the category (named "eventUnitName")
-    for (const QJsonValueRef &unitRef : this->o_discipline["units"].toArray()) {
-        QJsonObject unit = unitRef.toObject();
-
-        // validate unit
-        if (!unit.contains("eventUnitName")) continue;
-
-        categoryNames.insert(unit["eventUnitName"].toString());
-    }
-
-    return categoryNames;
-}
-
-/**
- * @brief Sport::getMedalsOfCompetitor Filters all competitors, who have at least one medal. These objects are different from getCompetitorsByCategory !!!
- * @return All competitors, who won at least one medal. Structure of one competitor: {code, name, m_noc, medals{ME_GOLD, ME_SILVER, ME_BRONZE}}
- */
-map<QString, map<QString, int>> SportModel::getMedalsOfCompetitors() {
-    map<QString, map<QString, int>> competitors;
-
-    if (!validateDiscipline()) return competitors;
-
-    // filter all units, which have medal events
-    QJsonArray units = filter(this->o_discipline["units"].toArray(), [](QJsonObject unit){
-        // search all units with Final, Gold or Bronze in their name, because these are the categories with the medal winners
-        QString unitName = unit["eventUnitName"].toString();
-        return unitName.contains("Bronze", Qt::CaseSensitive)
-               || unitName.contains("Gold", Qt::CaseSensitive)
-               || unitName.contains("Final", Qt::CaseSensitive);
-    });
-
-    for (const QJsonValueRef &unitRef : units) {
-        QJsonObject unit = unitRef.toObject();
-
-        // validate unit
-        if (!unit.contains("competitors")) continue;
-
-        // filter all competitors, who won medals
-        QJsonArray medalComps = filter(unit["competitors"].toArray(), [](QJsonObject comp) {
-            if (!comp.contains("results")) return false;
-
-            QString medalType = comp["results"].toObject()["medalType"].toString();
-            return !medalType.isEmpty();
-        });
-
-        for (const QJsonValueRef &medalCompRef : medalComps) {
-            QJsonObject medalComp = medalCompRef.toObject();
-
-            // validate competitor (with medal)
-            if (!medalComp.contains("name")
-                || !medalComp.contains("results")
-                || !medalComp["results"].toObject().contains("medalType")) continue;
-
-            QString name = medalComp["name"].toString();
-            QString medalType = medalComp["results"].toObject()["medalType"].toString();
-
-            // check if competitor has other medal(s)
-            if (competitors.find(name) == competitors.end()) {
-                map<QString, int> emptyMedalObject = {
-                    {"ME_GOLD", 0},
-                    {"ME_SILVER", 0},
-                    {"ME_BRONZE", 0}
-                };
-                competitors.insert({name, emptyMedalObject});
-            }
-
-            // update the medal count
-            competitors.find(name)->second.find(medalType)->second++;
-        }
-    }
-    return competitors;
-}
-
-/**
- * @brief Sport::filterByName Filter the competitors by name (case insensitive).
- * @param competitors The competitors of one category.
- * @param name The (part of the) name to search for.
- */
-void SportModel::filterByName(QList<Competitor*> &competitors, QString name) {
-    filterCompetitors(competitors, name);
-}
-
-/**
- * @brief Sport::filterByCountry Filter the competitors by their national olympics comittee (case insensitive, short form).
- * @param competitors The competitors of one category.
- * @param nocShort The (part of the) national olympics comittee short name to search for.
- */
-void SportModel::filterByCountry(QList<Competitor*> &competitors, QString nocShort) {
-    filterCompetitors(competitors, nocShort);
-}
-
-/**
- * @brief Sport::filterCompetitors Filters the given QJsonArray by comparing the value of a certain attribute with the given filter string.
- * @param competitors The competitors of one category.
- * @param attribute The attribute to filter by.
- * @param filter The string, which should be contained.
- */
-void SportModel::filterCompetitors(QList<Competitor*> &competitors, QString filter) {
-    for (int i = 0; i < competitors.size(); i++) {
-        if (!competitors.value(i)->noc().contains(filter)) {
-            competitors.remove(i);
-            i--;
-        }
-    }
-}
-
-/**
- * @brief Sport::sortByName Sort the competitors by their name (alphabetical, ascending).
- * @param competitors The competitors of one category.
- */
-//void SportModel::sortByName(QList<Competitor*> &competitors) {
-//    if (competitors.isEmpty()) return;
-//    std::sort(competitors.begin(), competitors.end(), Competitor::compareName);
-//}
-
-/**
- * @brief Sport::sortByCountry Sort the competitors by their national olympic comittee short name (alphabetical, ascending).
- * @param competitors The competitors of one category.
- */
-//void SportModel::sortByCountry(QList<Competitor*> &competitors) {
-//    if (competitors.isEmpty()) return;
-//    std::sort(competitors.begin(), competitors.end(), Competitor::compareNOC);
-//}
-
-/**
- * @brief Sport::sortByResult Sort the competitors by their results in one specific category (numerical, ascending).
- * @param competitors The competitors of one category.
- */
-//void SportModel::sortByResult(QList<Competitor*> &competitors) {
-//    if (competitors.isEmpty()) return;
-//    std::sort(competitors.begin(), competitors.end(), Competitor::compareMark);
-//}
-
-/**
- * @brief Sport::sortByMedals Sort the competitors by their medal amounts in one specific category (numerical, ascending).
- * @param competitors The competitors of one category.
- */
-//void SportModel::sortByMedals(QList<Competitor*> &competitors) {
-//    if (competitors.isEmpty()) return;
-//    std::sort(competitors.begin(), competitors.end(), Competitor::compareMedals);
-//}
-
-/**
- * @brief Sport::reverseOrder Reverses the order of the competitors.
- * @param competitors The competitors of one category.
- */
-void SportModel::reverseOrder(QList<Competitor*> &competitors) {
-    int iterations = competitors.size() / 2; // automatically rounds down
-
-    for (int i = 0; i < iterations; i++) {
-        Competitor *left = competitors.value(i);
-        Competitor *right = competitors.value(competitors.size() - 1 - i);
-
-        competitors.replace(i, right);
-        competitors.replace(competitors.size() - 1 - i, left);
-    }
-}
-
-/**
- * @brief Sport::addRelativeToFirst Adds a relative value to the result of all competitors. Relative to the first competitor in the QJsonArray.
- * Stores the m_statistic in obj->results->stat for each competitor.
- * @param competitors The competitors of one category.
- */
-void SportModel::addRelativeToFirst(QList<Competitor*> &competitors) {
-    if (competitors.isEmpty()) return;
-
-    QString reference = competitors.value(0)->mark();
-
-    for (int i = 0; i < competitors.size(); i++) {
-        Competitor *comp = competitors.value(i);
-
-        QString result = comp->mark();
-
-        // format relative float value to string with 2 digits after decimal point and sign
-        stringstream sstream;
-        sstream << fixed << setprecision(2) << calcRelativeStat(reference, result);
-        QString stat(sstream.str().c_str());
-        stat.append("%");
-        if (stat.at(0).isNumber()) stat = QString("+").append(stat);
-
-        comp->setStatistic(stat);
-    }
-
-}
-
-/**
- * @brief Sport::calcRelativeStat Calculates the relative deviation of val from ref in percent.
- * @param ref The reference value.
- * @param val The value to calculate the deviation from.
- * @return The deviation from ref to val in percent.
- */
-float SportModel::calcRelativeStat(QString ref, QString val) {
-    // check if the value is not a time
-    if (!ref.contains(":") && !val.contains(":")) {
-        float fRef = ref.toFloat();
-
-        if (fRef == 0) return 0.0;
-        return ((val.toFloat() * 100)/ fRef) - 100;
-    }
-
-    regex r("\\d+");
-    smatch mref, mval;
-    string sref = ref.toUtf8().constData();
-    string sval = val.toUtf8().constData();
-
-    regex_search(sref, mref, r);
-    regex_search(sval, mval, r);
-
-    float timeRef = stof(mref.str(1)) * 60 * 100 + stof(mref.str(2)) * 100 + stof(mref.str(3));
-    float timeVal = stof(mval.str(1)) * 60 * 100 + stof(mval.str(2)) * 100 + stof(mval.str(3));
-
-    return ((timeVal * 100) / timeRef) - 100;
-}
--- a/src/model/SportModel.h
+++ b/src/model/SportModel.h
@ -1,83 +0,0 @@
-#pragma once
-
-#include <QAbstractListModel>
-#include <QNetworkAccessManager>
-#include <qcontainerfwd.h>
-#include <set>
-
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QString>
-#include <QList>
-#include "EventInfo.h"
-
-using namespace std;
-
-class SportModel : public QAbstractListModel
-{
-  Q_OBJECT
-
-  Q_PROPERTY(QString discipline READ discipline WRITE setDiscipline NOTIFY disciplineChanged);
-
-public:
-  enum Role
-  {
-    EventName = Qt::UserRole + 1,
-    Competitors
-  };
-
-  explicit SportModel(QObject *parent = nullptr);
-
-  void setDiscipline(QJsonObject discipline)
-  {
-      this->o_discipline = QJsonObject(discipline);
-  }
-
-  virtual int rowCount(const QModelIndex &parent) const override;
-  virtual QVariant data(const QModelIndex &index, int role) const override;
-  virtual QHash<int, QByteArray> roleNames() const override;
-
-  set<QString> getCategories();
-  map<QString, map<QString, int>> getMedalsOfCompetitors();
-
-  // filter to change the current competitor list
-  void lastName(QList<Competitor*> &competitors);
-  void filterByName(QList<Competitor*> &competitors, QString name);
-  void filterByCountry(QList<Competitor*> &competitors, QString nocShort);
-
-  // sort functions to change the order of the current competitor list
-//  void sortByName(QList<Competitor*> &competitors);
-//  void sortByCountry(QList<Competitor*> &competitors);
-//  void sortByResult(QList<Competitor*> &competitors);
-//  void sortByMedals(QList<Competitor*> &competitors);
-  void reverseOrder(QList<Competitor*> &competitors);
-
-  // statistic function
-  void addRelativeToFirst(QList<Competitor*> &competitors);
-
-  QString discipline() const;
-  void setDiscipline(const QString &discipline);
-
-public slots:
-  void request(QString discipline);
-  void parseData();
-
-signals:
-    void disciplineChanged();
-
-private:
-  QList<EventInfo *> m_sportList;
-  QString m_discipline;
-  QNetworkAccessManager m_networkManager;
-  QNetworkReply *m_reply = nullptr;
-
-  // data from api
-  QJsonObject o_discipline;
-  bool validateDiscipline();
-
-  void filterCompetitors(QList<Competitor*> &competitors, QString filter); // TODO ref instead of obj
-
-  // function for statistic calculation
-  float calcRelativeStat(QString ref, QString val);
-
-};
Author	SHA1	Message	Date
Orangerot	efeec3b99e	feat(JSON): test QJsonModel	2024-08-11 20:54:39 +02:00
Orangerot	cf013eb832	feat(QJsonModel): compile and first model test	2024-08-04 04:50:11 +02:00
Orangerot	71aee728b7	feat(qtquick): chat example to build up on	2024-07-30 10:56:05 +02:00
				`@ -0,0 +1 @@`
				`Subproject commit ed3652666d4954c2262eb5ceee8fda3e613f8c0c`