diff --git a/fmusim-gui/AbstractModelVariablesModel.cpp b/fmusim-gui/AbstractModelVariablesModel.cpp
index 8c066aac..1fadee5a 100644
--- a/fmusim-gui/AbstractModelVariablesModel.cpp
+++ b/fmusim-gui/AbstractModelVariablesModel.cpp
@@ -132,13 +132,13 @@ QVariant AbstractModelVariablesModel::columnData(const FMIModelVariable *variabl
             case FMIParameter:
             case FMIStructuralParameter:
             case FMICalculatedParameter:
-                return QIcon(":/variables/dark/float-parameter.svg");
+                return QIcon(":/variables/float-parameter.svg");
             case FMIInput:
-                return QIcon(":/variables/dark/float-input.svg");
+                return QIcon(":/variables/float-input.svg");
             case FMIOutput:
-                return QIcon(":/variables/dark/float-output.svg");
+                return QIcon(":/variables/float-output.svg");
             default:
-                return QIcon(":/variables/dark/float-variable.svg");
+                return QIcon(":/variables/float-variable.svg");
             }
         default:
             return QVariant();
diff --git a/fmusim-gui/BuildPlatformBinaryThread.cpp b/fmusim-gui/BuildPlatformBinaryThread.cpp
index e057efb4..d2fc5834 100644
--- a/fmusim-gui/BuildPlatformBinaryThread.cpp
+++ b/fmusim-gui/BuildPlatformBinaryThread.cpp
@@ -32,16 +32,16 @@ void BuildPlatformBinaryThread::run() {
 
     buildDirectory.setAutoRemove(removeBuilDirectory);
 
-    QFile::copy(":/resources/CMakeLists.txt", buildDirectory.filePath("CMakeLists.txt"));
+    QFile::copy(":/build/CMakeLists.txt", buildDirectory.filePath("CMakeLists.txt"));
 
     if (modelDescription->fmiMajorVersion == 2) {
-        QFile::copy(":/resources/fmi2Functions.h", buildDirectory.filePath("fmi2Functions.h"));
-        QFile::copy(":/resources/fmi2FunctionTypes.h", buildDirectory.filePath("fmi2FunctionTypes.h"));
-        QFile::copy(":/resources/fmi2TypesPlatform.h", buildDirectory.filePath("fmi2TypesPlatform.h"));
+        QFile::copy(":/build/fmi2Functions.h", buildDirectory.filePath("fmi2Functions.h"));
+        QFile::copy(":/build/fmi2FunctionTypes.h", buildDirectory.filePath("fmi2FunctionTypes.h"));
+        QFile::copy(":/build/fmi2TypesPlatform.h", buildDirectory.filePath("fmi2TypesPlatform.h"));
     } else {
-        QFile::copy(":/resources/fmi3Functions.h", buildDirectory.filePath("fmi3Functions.h"));
-        QFile::copy(":/resources/fmi3FunctionTypes.h", buildDirectory.filePath("fmi3FunctionTypes.h"));
-        QFile::copy(":/resources/fmi3PlatformTypes.h", buildDirectory.filePath("fmi3PlatformTypes.h"));
+        QFile::copy(":/build/fmi3Functions.h", buildDirectory.filePath("fmi3Functions.h"));
+        QFile::copy(":/build/fmi3FunctionTypes.h", buildDirectory.filePath("fmi3FunctionTypes.h"));
+        QFile::copy(":/build/fmi3PlatformTypes.h", buildDirectory.filePath("fmi3PlatformTypes.h"));
     }
 
     size_t nSourceFiles;
diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt
index ad25727e..4bb1e0be 100644
--- a/fmusim-gui/CMakeLists.txt
+++ b/fmusim-gui/CMakeLists.txt
@@ -46,7 +46,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         ${PROJECT_SOURCES}
         ModelVariablesTableModel.h
         ModelVariablesTableModel.cpp
-        plot.html
         ../src/FMI1.c
         ../src/FMI2.c
         ../include/FMI1.h
@@ -88,12 +87,16 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         ../fmusim/FMICVode.h
         ../fmusim/FMICVode.c
 
-        buttons.qrc
-        plot.qrc
-        icons/variables/variables.qrc
+        resources/buttons/buttons.qrc
+        resources/tools/tools.qrc
+
+        resources/plot/plot.html
+        resources/plot/plot.qrc
+
+        resources/variables/variables.qrc
+
         VariablesFilterModel.h VariablesFilterModel.cpp
         SimulationThread.h SimulationThread.cpp
-        resources.qrc
         BuildPlatformBinaryDialog.h BuildPlatformBinaryDialog.cpp BuildPlatformBinaryDialog.ui
         BuildPlatformBinaryThread.h BuildPlatformBinaryThread.cpp
 
@@ -101,7 +104,9 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         AbstractModelVariablesModel.h AbstractModelVariablesModel.cpp
         PlotUtil.h PlotUtil.cpp
 
-        resources/app-icon.rc
+        resources/icon/icon.qrc
+        resources/icon/icon.rc
+        resources/build/build.qrc
     )
 
 target_include_directories(fmusim-gui PRIVATE
diff --git a/fmusim-gui/MainWindow.ui b/fmusim-gui/MainWindow.ui
index e8a94334..5ad77638 100644
--- a/fmusim-gui/MainWindow.ui
+++ b/fmusim-gui/MainWindow.ui
@@ -11,11 +11,11 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>FMUSim GUI</string>
+   <string>FMUSim</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources.qrc">
-    <normaloff>:/fmusim.svg</normaloff>:/fmusim.svg</iconset>
+   <iconset resource="resources/icon/icon.qrc">
+    <normaloff>:/icon/icon.svg</normaloff>:/icon/icon.svg</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_7">
@@ -34,7 +34,7 @@
     <item row="0" column="0">
      <widget class="QStackedWidget" name="stackedWidget">
       <property name="currentIndex">
-       <number>2</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="startPage">
        <layout class="QGridLayout" name="gridLayout_9">
@@ -183,6 +183,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="4" column="0">
@@ -218,6 +221,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="5" column="1">
@@ -225,6 +231,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="4" column="1">
@@ -232,6 +241,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="0" column="1">
@@ -245,6 +257,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="7" column="0">
@@ -259,6 +274,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="1" column="0">
@@ -283,6 +301,9 @@
           <property name="wordWrap">
            <bool>true</bool>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="3" column="1">
@@ -290,6 +311,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="7" column="1">
@@ -297,6 +321,9 @@
           <property name="text">
            <string/>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
         <item row="2" column="0">
@@ -319,8 +346,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>68</width>
-             <height>34</height>
+             <width>631</width>
+             <height>377</height>
             </rect>
            </property>
            <layout class="QGridLayout" name="gridLayout_13">
@@ -969,12 +996,9 @@
           <property name="toolTip">
            <string>Filter parameter variables</string>
           </property>
-          <property name="text">
-           <string>P</string>
-          </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/parameter.svg</normaloff>:/buttons/dark/parameter.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/parameter.svg</normaloff>:/tools/dark/parameter.svg</iconset>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -992,12 +1016,9 @@
           <property name="toolTip">
            <string>Show optional columns</string>
           </property>
-          <property name="text">
-           <string>C</string>
-          </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/columns.svg</normaloff>:/buttons/dark/columns.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/columns.svg</normaloff>:/tools/dark/columns.svg</iconset>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -1012,12 +1033,9 @@
           <property name="toolTip">
            <string>Filter local variables</string>
           </property>
-          <property name="text">
-           <string>L</string>
-          </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/local-variable.svg</normaloff>:/buttons/dark/local-variable.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/local-variable.svg</normaloff>:/tools/dark/local-variable.svg</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -1041,12 +1059,9 @@
           <property name="toolTip">
            <string>Show list view</string>
           </property>
-          <property name="text">
-           <string>...</string>
-          </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/list.svg</normaloff>:/buttons/dark/list.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/list.svg</normaloff>:/tools/dark/list.svg</iconset>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -1074,12 +1089,9 @@
           <property name="toolTip">
            <string>Filter output variables</string>
           </property>
-          <property name="text">
-           <string>O</string>
-          </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/output-variable.svg</normaloff>:/buttons/dark/output-variable.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/output-variable.svg</normaloff>:/tools/dark/output-variable.svg</iconset>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -1097,12 +1109,9 @@
           <property name="toolTip">
            <string>Filter input variables</string>
           </property>
-          <property name="text">
-           <string>I</string>
-          </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/input-variable.svg</normaloff>:/buttons/dark/input-variable.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/input-variable.svg</normaloff>:/tools/dark/input-variable.svg</iconset>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -1121,8 +1130,8 @@
            <string>Clear all plots</string>
           </property>
           <property name="icon">
-           <iconset resource="buttons.qrc">
-            <normaloff>:/buttons/dark/broom.svg</normaloff>:/buttons/dark/broom.svg</iconset>
+           <iconset resource="resources/tools/tools.qrc">
+            <normaloff>:/tools/dark/broom.svg</normaloff>:/tools/dark/broom.svg</iconset>
           </property>
           <property name="autoRaise">
            <bool>true</bool>
@@ -1189,7 +1198,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/gear.svg</normaloff>:/buttons/dark/gear.svg</iconset>
    </property>
    <property name="text">
@@ -1204,7 +1213,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/file-earmark-zip.svg</normaloff>:/buttons/dark/file-earmark-zip.svg</iconset>
    </property>
    <property name="text">
@@ -1219,7 +1228,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/book.svg</normaloff>:/buttons/dark/book.svg</iconset>
    </property>
    <property name="text">
@@ -1234,7 +1243,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/graph.svg</normaloff>:/buttons/dark/graph.svg</iconset>
    </property>
    <property name="text">
@@ -1246,7 +1255,7 @@
   </action>
   <action name="openFileAction">
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/folder-open.svg</normaloff>:/buttons/dark/folder-open.svg</iconset>
    </property>
    <property name="text">
@@ -1261,7 +1270,7 @@
   </action>
   <action name="simulateAction">
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/play.svg</normaloff>:/buttons/dark/play.svg</iconset>
    </property>
    <property name="text">
@@ -1287,7 +1296,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/list-task.svg</normaloff>:/buttons/dark/list-task.svg</iconset>
    </property>
    <property name="text">
@@ -1302,7 +1311,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/side-bar.svg</normaloff>:/buttons/dark/side-bar.svg</iconset>
    </property>
    <property name="text">
@@ -1317,7 +1326,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/info.svg</normaloff>:/buttons/dark/info.svg</iconset>
    </property>
    <property name="text">
@@ -1332,7 +1341,7 @@
   </action>
   <action name="newWindowAction">
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/new-window.svg</normaloff>:/buttons/dark/new-window.svg</iconset>
    </property>
    <property name="text">
@@ -1347,7 +1356,7 @@
   </action>
   <action name="buildPlatformBinaryAction">
    <property name="icon">
-    <iconset resource="buttons.qrc">
+    <iconset resource="resources/buttons/buttons.qrc">
      <normaloff>:/buttons/dark/hammer.svg</normaloff>:/buttons/dark/hammer.svg</iconset>
    </property>
    <property name="text">
@@ -1370,8 +1379,9 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="buttons.qrc"/>
-  <include location="resources.qrc"/>
+  <include location="resources/buttons/buttons.qrc"/>
+  <include location="resources/icon/icon.qrc"/>
+  <include location="resources/tools/tools.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/fmusim-gui/ModelVariablesTreeModel.cpp b/fmusim-gui/ModelVariablesTreeModel.cpp
index dc0c2633..9b301a14 100644
--- a/fmusim-gui/ModelVariablesTreeModel.cpp
+++ b/fmusim-gui/ModelVariablesTreeModel.cpp
@@ -62,7 +62,7 @@ QVariant ModelVariablesTreeModel::data(const QModelIndex &index, int role) const
     }
 
     if (index.column() == NameColumn && role == Qt::DecorationRole) {
-        return QIcon(":/variables/dark/subsystem.svg");
+        return QIcon(":/variables/subsystem.svg");
     }
 
     return QVariant();
diff --git a/fmusim-gui/buttons.qrc b/fmusim-gui/buttons.qrc
deleted file mode 100644
index e5be88d1..00000000
--- a/fmusim-gui/buttons.qrc
+++ /dev/null
@@ -1,42 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>buttons/dark/book.svg</file>
-        <file>buttons/dark/file-earmark-zip.svg</file>
-        <file>buttons/dark/folder-open.svg</file>
-        <file>buttons/dark/gear.svg</file>
-        <file>buttons/dark/graph.svg</file>
-        <file>buttons/dark/list-task.svg</file>
-        <file>buttons/dark/play.svg</file>
-        <file>buttons/dark/stop.svg</file>
-        <file>buttons/light/book.svg</file>
-        <file>buttons/light/file-earmark-zip.svg</file>
-        <file>buttons/light/folder-open.svg</file>
-        <file>buttons/light/gear.svg</file>
-        <file>buttons/light/graph.svg</file>
-        <file>buttons/light/list-task.svg</file>
-        <file>buttons/light/play.svg</file>
-        <file>buttons/light/stop.svg</file>
-        <file>buttons/dark/side-bar.svg</file>
-        <file>buttons/light/side-bar.svg</file>
-        <file>buttons/dark/columns.svg</file>
-        <file>buttons/dark/parameter.svg</file>
-        <file>buttons/dark/output-variable.svg</file>
-        <file>buttons/dark/input-variable.svg</file>
-        <file>buttons/dark/local-variable.svg</file>
-        <file>buttons/light/columns.svg</file>
-        <file>buttons/light/output-variable.svg</file>
-        <file>buttons/light/input-variable.svg</file>
-        <file>buttons/light/local-variable.svg</file>
-        <file>buttons/light/parameter.svg</file>
-        <file>buttons/dark/info.svg</file>
-        <file>buttons/light/info.svg</file>
-        <file>buttons/dark/new-window.svg</file>
-        <file>buttons/light/new-window.svg</file>
-        <file>buttons/dark/hammer.svg</file>
-        <file>buttons/light/hammer.svg</file>
-        <file>buttons/dark/list.svg</file>
-        <file>buttons/light/list.svg</file>
-        <file>buttons/dark/broom.svg</file>
-        <file>buttons/light/broom.svg</file>
-    </qresource>
-</RCC>
diff --git a/fmusim-gui/buttons/book.svg b/fmusim-gui/buttons/book.svg
deleted file mode 100644
index 66f9dc78..00000000
--- a/fmusim-gui/buttons/book.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.25,0,0,1.25,6,6.69017)">
-        <g id="book">
-            <path d="M1,2.828C1.885,2.458 3.154,2.059 4.388,1.935C5.718,1.801 6.846,1.998 7.5,2.687L7.5,12.433C6.565,11.903 5.38,11.83 4.287,11.94C3.107,12.06 1.917,12.401 1,12.751L1,2.828ZM8.5,2.687C9.154,1.998 10.282,1.801 11.612,1.935C12.846,2.059 14.115,2.458 15,2.828L15,12.751C14.082,12.401 12.893,12.059 11.713,11.941C10.619,11.83 9.435,11.902 8.5,12.433L8.5,2.687ZM8,1.783C7.015,0.936 5.587,0.81 4.287,0.94C2.773,1.093 1.245,1.612 0.293,2.045C0.115,2.126 0,2.304 0,2.5L0,13.5C0,13.774 0.226,14 0.5,14C0.571,14 0.642,13.985 0.707,13.955C1.589,13.555 3.01,13.074 4.387,12.935C5.796,12.793 6.977,13.022 7.61,13.812C7.705,13.93 7.848,13.999 8,13.999C8.152,13.999 8.295,13.93 8.39,13.812C9.023,13.022 10.204,12.793 11.612,12.935C12.99,13.074 14.412,13.555 15.293,13.955C15.358,13.985 15.429,14 15.5,14C15.774,14 16,13.774 16,13.5L16,2.5C16,2.304 15.885,2.126 15.707,2.045C14.755,1.612 13.227,1.093 11.713,0.94C10.413,0.809 8.985,0.936 8,1.783Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/file-earmark-zip.svg b/fmusim-gui/buttons/file-earmark-zip.svg
deleted file mode 100644
index 1f41d882..00000000
--- a/fmusim-gui/buttons/file-earmark-zip.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="file-earmark-zip" transform="matrix(0.0446429,0,0,0.0446429,4.57143,4.57143)">
-        <g transform="matrix(28,0,0,28,32,32)">
-            <path d="M5,7.5C5,6.951 5.451,6.5 6,6.5L7,6.5C7.549,6.5 8,6.951 8,7.5L8,8.438L8.4,10.037C8.502,10.446 8.335,10.877 7.984,11.111L7.054,11.731C6.719,11.955 6.279,11.955 5.944,11.731L5.015,11.111C4.665,10.877 4.498,10.446 4.6,10.037L5,8.438L5,7.5ZM7,7.5L6,7.5L6,8.438C6,8.52 5.99,8.602 5.97,8.681L5.57,10.279L6.5,10.899L7.429,10.279L7.029,8.681C7.009,8.601 7,8.52 7,8.438L7,7.5Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(28,0,0,28,32,32)">
-            <path d="M14,4.5L14,14C14,15.097 13.097,16 12,16L4,16C2.903,16 2,15.097 2,14L2,2C2,0.903 2.903,0 4,0L9.5,0L14,4.5ZM11,4.5C10.177,4.5 9.5,3.823 9.5,3L9.5,1L7.5,1L7.5,2L6.5,2L6.5,3L7.5,3L7.5,4L6.5,4L6.5,5L7.5,5L7.5,6L6,6L6,5L5,5L5,4L6,4L6,3L5,3L5,2L6,2L6,1L4,1C3.451,1 3,1.451 3,2L3,14C3,14.549 3.451,15 4,15L12,15C12.549,15 13,14.549 13,14L13,4.5L11,4.5Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/folder-open.svg b/fmusim-gui/buttons/folder-open.svg
deleted file mode 100644
index 1f9e19a8..00000000
--- a/fmusim-gui/buttons/folder-open.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="folder-open" transform="matrix(1.39821,0,0,1.39821,4.81345,4.11525)">
-        <path d="M1,3.5C1,2.677 1.677,2 2.5,2L5.264,2C6.222,2 7.024,2.56 7.575,3.184C7.985,3.648 8.48,4 9,4L13.5,4C14.323,4 15,4.677 15,5.5L15,6.14C15.57,6.405 15.94,7.016 15.856,7.686L15.216,12.81C15.06,14.056 13.989,15.001 12.733,15L3.266,15C2.011,15 0.941,14.055 0.785,12.81L0.145,7.686C0.064,7.041 0.411,6.414 1,6.14L1,3.5ZM2,6L14,6L14,5.5C14,5.226 13.774,5 13.5,5L9,5C8.036,5 7.29,4.371 6.826,3.846C6.374,3.334 5.82,3 5.264,3L2.5,3C2.226,3 2,3.226 2,3.5L2,6ZM1.633,7C1.359,7 1.133,7.226 1.133,7.5C1.133,7.521 1.134,7.541 1.137,7.562L1.777,12.686C1.87,13.433 2.513,14 3.266,14L12.734,14C13.487,14 14.13,13.433 14.223,12.686L14.863,7.562C14.866,7.541 14.867,7.521 14.867,7.5C14.867,7.226 14.641,7 14.367,7L1.633,7Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/graph.svg b/fmusim-gui/buttons/graph.svg
deleted file mode 100644
index 2946b2e2..00000000
--- a/fmusim-gui/buttons/graph.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.25,0,0,1.25,6,6)">
-        <g id="graph">
-            <path d="M0,0L1,0L1,15L16,15L16,16L0,16L0,0ZM14.817,3.113C14.933,3.208 15,3.35 15,3.5C15,3.616 14.96,3.728 14.887,3.817L10.387,9.317C10.292,9.433 10.15,9.5 10,9.5C9.868,9.5 9.741,9.448 9.647,9.354L7.06,6.767L3.404,11.794C3.309,11.914 3.164,11.985 3.011,11.985C2.737,11.985 2.511,11.759 2.511,11.485C2.511,11.386 2.541,11.288 2.596,11.206L6.596,5.706C6.69,5.577 6.841,5.5 7.001,5.5C7.133,5.5 7.26,5.552 7.354,5.646L9.963,8.256L14.113,3.183C14.208,3.067 14.35,3 14.5,3C14.616,3 14.728,3.04 14.817,3.113Z" style="fill:rgb(51,51,51);"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/light/gear.svg b/fmusim-gui/buttons/light/gear.svg
deleted file mode 100644
index ef078d80..00000000
--- a/fmusim-gui/buttons/light/gear.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="gear">
-        <g transform="matrix(1.25002,0,0,1.25002,5.99987,5.99987)">
-            <path d="M8,4.754C6.219,4.754 4.754,6.219 4.754,8C4.754,9.781 6.219,11.246 8,11.246C9.781,11.246 11.246,9.781 11.246,8C11.246,6.219 9.781,4.754 8,4.754ZM5.754,8C5.754,6.768 6.768,5.754 8,5.754C9.232,5.754 10.246,6.768 10.246,8C10.246,9.232 9.232,10.246 8,10.246C6.768,10.246 5.754,9.232 5.754,8Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1.25002,0,0,1.25002,5.99987,5.99987)">
-            <path d="M9.796,1.343C9.269,-0.447 6.731,-0.447 6.204,1.343L6.11,1.662C6.001,2.032 5.659,2.288 5.273,2.288C5.127,2.288 4.983,2.252 4.855,2.182L4.563,2.022C2.923,1.13 1.13,2.924 2.023,4.563L2.182,4.855C2.252,4.983 2.288,5.127 2.288,5.273C2.288,5.659 2.032,6.001 1.662,6.11L1.343,6.204C-0.447,6.731 -0.447,9.269 1.343,9.796L1.662,9.89C2.032,9.999 2.288,10.341 2.288,10.727C2.288,10.873 2.252,11.017 2.182,11.145L2.022,11.437C1.13,13.077 2.923,14.871 4.563,13.977L4.855,13.818C4.983,13.748 5.127,13.712 5.273,13.712C5.659,13.712 6.001,13.968 6.11,14.338L6.204,14.657C6.731,16.447 9.269,16.447 9.796,14.657L9.89,14.338C9.999,13.968 10.341,13.712 10.727,13.712C10.873,13.712 11.017,13.748 11.145,13.818L11.437,13.978C13.077,14.871 14.871,13.076 13.977,11.437L13.818,11.145C13.748,11.017 13.712,10.873 13.712,10.727C13.712,10.341 13.968,9.999 14.338,9.89L14.657,9.796C16.447,9.269 16.447,6.731 14.657,6.204L14.338,6.11C13.968,6.001 13.712,5.659 13.712,5.273C13.712,5.127 13.748,4.983 13.818,4.855L13.978,4.563C14.871,2.923 13.076,1.13 11.437,2.023L11.145,2.182C11.017,2.252 10.873,2.288 10.727,2.288C10.341,2.288 9.999,2.032 9.89,1.662L9.796,1.343ZM7.163,1.626C7.409,0.791 8.591,0.791 8.837,1.626L8.931,1.945C9.165,2.739 9.9,3.288 10.728,3.288C11.041,3.288 11.349,3.21 11.624,3.06L11.915,2.9C12.679,2.485 13.515,3.32 13.099,4.085L12.94,4.377C12.791,4.652 12.712,4.96 12.712,5.272C12.712,6.101 13.262,6.835 14.056,7.069L14.374,7.163C15.209,7.409 15.209,8.591 14.374,8.837L14.055,8.931C13.261,9.165 12.712,9.9 12.712,10.728C12.712,11.041 12.79,11.349 12.94,11.624L13.1,11.915C13.515,12.679 12.68,13.515 11.915,13.099L11.624,12.94C11.349,12.79 11.041,12.712 10.728,12.712C9.899,12.712 9.165,13.261 8.931,14.056L8.837,14.374C8.591,15.209 7.409,15.209 7.163,14.374L7.069,14.055C6.835,13.261 6.1,12.712 5.273,12.712C4.96,12.712 4.652,12.79 4.377,12.94L4.085,13.1C3.321,13.515 2.485,12.68 2.901,11.915L3.06,11.624C3.21,11.349 3.289,11.04 3.289,10.727C3.289,9.898 2.74,9.164 1.945,8.93L1.626,8.836C0.791,8.59 0.791,7.408 1.626,7.162L1.945,7.068C2.739,6.834 3.288,6.099 3.288,5.272C3.288,4.959 3.209,4.652 3.06,4.377L2.9,4.085C2.485,3.321 3.32,2.485 4.085,2.901L4.377,3.06C4.652,3.21 4.96,3.288 5.273,3.288C6.1,3.288 6.835,2.739 7.069,1.945L7.163,1.626Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/list-task.svg b/fmusim-gui/buttons/list-task.svg
deleted file mode 100644
index 2ecbcbdf..00000000
--- a/fmusim-gui/buttons/list-task.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="list-task" transform="matrix(0.0446429,0,0,0.0446429,4.57143,4.57143)">
-        <g transform="matrix(33.1852,0,0,33.1852,-17.7778,7.11111)">
-            <path d="M2,2.5C1.726,2.5 1.5,2.726 1.5,3L1.5,4C1.5,4.274 1.726,4.5 2,4.5L3,4.5C3.274,4.5 3.5,4.274 3.5,4L3.5,3C3.5,2.726 3.274,2.5 3,2.5L2,2.5ZM3,3L2,3L2,4L3,4L3,3Z" style="fill:rgb(51,51,51);"/>
-        </g>
-        <g transform="matrix(33.1852,0,0,33.1852,-17.7778,7.11111)">
-            <path d="M5,3.5C5,3.226 5.226,3 5.5,3L14.5,3C14.774,3 15,3.226 15,3.5C15,3.774 14.774,4 14.5,4L5.5,4C5.226,4 5,3.774 5,3.5ZM5.5,7C5.226,7 5,7.226 5,7.5C5,7.774 5.226,8 5.5,8L14.5,8C14.774,8 15,7.774 15,7.5C15,7.226 14.774,7 14.5,7L5.5,7ZM5.5,11C5.226,11 5,11.226 5,11.5C5,11.774 5.226,12 5.5,12L14.5,12C14.774,12 15,11.774 15,11.5C15,11.226 14.774,11 14.5,11L5.5,11Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(33.1852,0,0,33.1852,-17.7778,7.11111)">
-            <path d="M1.5,7C1.5,6.726 1.726,6.5 2,6.5L3,6.5C3.274,6.5 3.5,6.726 3.5,7L3.5,8C3.5,8.274 3.274,8.5 3,8.5L2,8.5C1.726,8.5 1.5,8.274 1.5,8L1.5,7ZM2,7L3,7L3,8L2,8L2,7ZM2,10.5C1.726,10.5 1.5,10.726 1.5,11L1.5,12C1.5,12.274 1.726,12.5 2,12.5L3,12.5C3.274,12.5 3.5,12.274 3.5,12L3.5,11C3.5,10.726 3.274,10.5 3,10.5L2,10.5ZM3,11L2,11L2,12L3,12L3,11Z" style="fill:rgb(51,51,51);"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/play.svg b/fmusim-gui/buttons/play.svg
deleted file mode 100644
index 977d696b..00000000
--- a/fmusim-gui/buttons/play.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.77753,0,0,1.77753,1.77942,1.77927)">
-        <g id="play">
-            <path d="M11.596,8.697L5.233,12.389C4.693,12.702 4,12.323 4,11.692L4,4.308C4,3.678 4.692,3.298 5.233,3.612L11.596,7.304C11.846,7.447 12,7.713 12,8.001C12,8.288 11.846,8.554 11.596,8.697Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/buttons/stop.svg b/fmusim-gui/buttons/stop.svg
deleted file mode 100644
index 3444ee88..00000000
--- a/fmusim-gui/buttons/stop.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.44444,0,0,1.44444,4.44444,4.44444)">
-        <g id="stop">
-            <path d="M5,3.5L11,3.5C11.823,3.5 12.5,4.177 12.5,5L12.5,11C12.5,11.823 11.823,12.5 11,12.5L5,12.5C4.177,12.5 3.5,11.823 3.5,11L3.5,5C3.5,4.177 4.177,3.5 5,3.5Z" style="fill:rgb(51,51,51);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/fmusim-gui/icons/variables/variables.qrc b/fmusim-gui/icons/variables/variables.qrc
deleted file mode 100644
index 6b516680..00000000
--- a/fmusim-gui/icons/variables/variables.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
-    <qresource prefix="/variables">
-        <file>dark/float-input.svg</file>
-        <file>dark/float-output.svg</file>
-        <file>dark/float-parameter.svg</file>
-        <file>dark/float-variable.svg</file>
-        <file>dark/subsystem.svg</file>
-    </qresource>
-</RCC>
diff --git a/fmusim-gui/resources.qrc b/fmusim-gui/resources.qrc
deleted file mode 100644
index 567e52a5..00000000
--- a/fmusim-gui/resources.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>fmusim.svg</file>
-        <file>resources/CMakeLists.txt</file>
-        <file>resources/fmi2FunctionTypes.h</file>
-        <file>resources/fmi2TypesPlatform.h</file>
-        <file>resources/fmi3Functions.h</file>
-        <file>resources/fmi3FunctionTypes.h</file>
-        <file>resources/fmi3PlatformTypes.h</file>
-        <file>resources/fmi2Functions.h</file>
-    </qresource>
-</RCC>
diff --git a/fmusim-gui/resources/app-icon.rc b/fmusim-gui/resources/app-icon.rc
deleted file mode 100644
index abf531e9..00000000
--- a/fmusim-gui/resources/app-icon.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-IDI_ICON1		ICON		DISCARDABLE	"app-icon.ico"
-
diff --git a/fmusim-gui/resources/CMakeLists.txt b/fmusim-gui/resources/build/CMakeLists.txt
similarity index 100%
rename from fmusim-gui/resources/CMakeLists.txt
rename to fmusim-gui/resources/build/CMakeLists.txt
diff --git a/fmusim-gui/resources/build/build.qrc b/fmusim-gui/resources/build/build.qrc
new file mode 100644
index 00000000..111a7acf
--- /dev/null
+++ b/fmusim-gui/resources/build/build.qrc
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/build">
+        <file>CMakeLists.txt</file>
+        <file>fmi2Functions.h</file>
+        <file>fmi2FunctionTypes.h</file>
+        <file>fmi2TypesPlatform.h</file>
+        <file>fmi3Functions.h</file>
+        <file>fmi3FunctionTypes.h</file>
+        <file>fmi3PlatformTypes.h</file>
+    </qresource>
+</RCC>
diff --git a/fmusim-gui/resources/fmi2FunctionTypes.h b/fmusim-gui/resources/build/fmi2FunctionTypes.h
similarity index 100%
rename from fmusim-gui/resources/fmi2FunctionTypes.h
rename to fmusim-gui/resources/build/fmi2FunctionTypes.h
diff --git a/fmusim-gui/resources/fmi2Functions.h b/fmusim-gui/resources/build/fmi2Functions.h
similarity index 100%
rename from fmusim-gui/resources/fmi2Functions.h
rename to fmusim-gui/resources/build/fmi2Functions.h
diff --git a/fmusim-gui/resources/fmi2TypesPlatform.h b/fmusim-gui/resources/build/fmi2TypesPlatform.h
similarity index 100%
rename from fmusim-gui/resources/fmi2TypesPlatform.h
rename to fmusim-gui/resources/build/fmi2TypesPlatform.h
diff --git a/fmusim-gui/resources/fmi3FunctionTypes.h b/fmusim-gui/resources/build/fmi3FunctionTypes.h
similarity index 100%
rename from fmusim-gui/resources/fmi3FunctionTypes.h
rename to fmusim-gui/resources/build/fmi3FunctionTypes.h
diff --git a/fmusim-gui/resources/fmi3Functions.h b/fmusim-gui/resources/build/fmi3Functions.h
similarity index 100%
rename from fmusim-gui/resources/fmi3Functions.h
rename to fmusim-gui/resources/build/fmi3Functions.h
diff --git a/fmusim-gui/resources/fmi3PlatformTypes.h b/fmusim-gui/resources/build/fmi3PlatformTypes.h
similarity index 100%
rename from fmusim-gui/resources/fmi3PlatformTypes.h
rename to fmusim-gui/resources/build/fmi3PlatformTypes.h
diff --git a/fmusim-gui/buttons/buttons.afdesign b/fmusim-gui/resources/buttons/buttons.afdesign
similarity index 100%
rename from fmusim-gui/buttons/buttons.afdesign
rename to fmusim-gui/resources/buttons/buttons.afdesign
diff --git a/fmusim-gui/resources/buttons/buttons.qrc b/fmusim-gui/resources/buttons/buttons.qrc
new file mode 100644
index 00000000..f03ca41a
--- /dev/null
+++ b/fmusim-gui/resources/buttons/buttons.qrc
@@ -0,0 +1,28 @@
+<RCC>
+    <qresource prefix="/buttons">
+        <file>dark/book.svg</file>
+        <file>dark/file-earmark-zip.svg</file>
+        <file>dark/folder-open.svg</file>
+        <file>dark/gear.svg</file>
+        <file>dark/graph.svg</file>
+        <file>dark/hammer.svg</file>
+        <file>dark/info.svg</file>
+        <file>dark/list-task.svg</file>
+        <file>dark/new-window.svg</file>
+        <file>dark/play.svg</file>
+        <file>dark/side-bar.svg</file>
+        <file>dark/stop.svg</file>
+        <file>light/book.svg</file>
+        <file>light/file-earmark-zip.svg</file>
+        <file>light/folder-open.svg</file>
+        <file>light/gear.svg</file>
+        <file>light/graph.svg</file>
+        <file>light/hammer.svg</file>
+        <file>light/info.svg</file>
+        <file>light/list-task.svg</file>
+        <file>light/new-window.svg</file>
+        <file>light/play.svg</file>
+        <file>light/side-bar.svg</file>
+        <file>light/stop.svg</file>
+    </qresource>
+</RCC>
diff --git a/fmusim-gui/buttons/dark/book.svg b/fmusim-gui/resources/buttons/dark/book.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/book.svg
rename to fmusim-gui/resources/buttons/dark/book.svg
diff --git a/fmusim-gui/buttons/dark/file-earmark-zip.svg b/fmusim-gui/resources/buttons/dark/file-earmark-zip.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/file-earmark-zip.svg
rename to fmusim-gui/resources/buttons/dark/file-earmark-zip.svg
diff --git a/fmusim-gui/buttons/dark/folder-open.svg b/fmusim-gui/resources/buttons/dark/folder-open.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/folder-open.svg
rename to fmusim-gui/resources/buttons/dark/folder-open.svg
diff --git a/fmusim-gui/buttons/dark/gear.svg b/fmusim-gui/resources/buttons/dark/gear.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/gear.svg
rename to fmusim-gui/resources/buttons/dark/gear.svg
diff --git a/fmusim-gui/buttons/dark/graph.svg b/fmusim-gui/resources/buttons/dark/graph.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/graph.svg
rename to fmusim-gui/resources/buttons/dark/graph.svg
diff --git a/fmusim-gui/buttons/dark/hammer.svg b/fmusim-gui/resources/buttons/dark/hammer.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/hammer.svg
rename to fmusim-gui/resources/buttons/dark/hammer.svg
diff --git a/fmusim-gui/buttons/dark/info.svg b/fmusim-gui/resources/buttons/dark/info.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/info.svg
rename to fmusim-gui/resources/buttons/dark/info.svg
diff --git a/fmusim-gui/buttons/dark/list-task.svg b/fmusim-gui/resources/buttons/dark/list-task.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/list-task.svg
rename to fmusim-gui/resources/buttons/dark/list-task.svg
diff --git a/fmusim-gui/buttons/dark/new-window.svg b/fmusim-gui/resources/buttons/dark/new-window.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/new-window.svg
rename to fmusim-gui/resources/buttons/dark/new-window.svg
diff --git a/fmusim-gui/buttons/dark/play.svg b/fmusim-gui/resources/buttons/dark/play.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/play.svg
rename to fmusim-gui/resources/buttons/dark/play.svg
diff --git a/fmusim-gui/buttons/dark/side-bar.svg b/fmusim-gui/resources/buttons/dark/side-bar.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/side-bar.svg
rename to fmusim-gui/resources/buttons/dark/side-bar.svg
diff --git a/fmusim-gui/buttons/dark/stop.svg b/fmusim-gui/resources/buttons/dark/stop.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/stop.svg
rename to fmusim-gui/resources/buttons/dark/stop.svg
diff --git a/fmusim-gui/buttons/light/book.svg b/fmusim-gui/resources/buttons/light/book.svg
similarity index 100%
rename from fmusim-gui/buttons/light/book.svg
rename to fmusim-gui/resources/buttons/light/book.svg
diff --git a/fmusim-gui/buttons/light/file-earmark-zip.svg b/fmusim-gui/resources/buttons/light/file-earmark-zip.svg
similarity index 100%
rename from fmusim-gui/buttons/light/file-earmark-zip.svg
rename to fmusim-gui/resources/buttons/light/file-earmark-zip.svg
diff --git a/fmusim-gui/buttons/light/folder-open.svg b/fmusim-gui/resources/buttons/light/folder-open.svg
similarity index 100%
rename from fmusim-gui/buttons/light/folder-open.svg
rename to fmusim-gui/resources/buttons/light/folder-open.svg
diff --git a/fmusim-gui/buttons/gear.svg b/fmusim-gui/resources/buttons/light/gear.svg
similarity index 100%
rename from fmusim-gui/buttons/gear.svg
rename to fmusim-gui/resources/buttons/light/gear.svg
diff --git a/fmusim-gui/buttons/light/graph.svg b/fmusim-gui/resources/buttons/light/graph.svg
similarity index 100%
rename from fmusim-gui/buttons/light/graph.svg
rename to fmusim-gui/resources/buttons/light/graph.svg
diff --git a/fmusim-gui/buttons/light/hammer.svg b/fmusim-gui/resources/buttons/light/hammer.svg
similarity index 100%
rename from fmusim-gui/buttons/light/hammer.svg
rename to fmusim-gui/resources/buttons/light/hammer.svg
diff --git a/fmusim-gui/buttons/light/info.svg b/fmusim-gui/resources/buttons/light/info.svg
similarity index 100%
rename from fmusim-gui/buttons/light/info.svg
rename to fmusim-gui/resources/buttons/light/info.svg
diff --git a/fmusim-gui/buttons/light/list-task.svg b/fmusim-gui/resources/buttons/light/list-task.svg
similarity index 100%
rename from fmusim-gui/buttons/light/list-task.svg
rename to fmusim-gui/resources/buttons/light/list-task.svg
diff --git a/fmusim-gui/buttons/light/new-window.svg b/fmusim-gui/resources/buttons/light/new-window.svg
similarity index 100%
rename from fmusim-gui/buttons/light/new-window.svg
rename to fmusim-gui/resources/buttons/light/new-window.svg
diff --git a/fmusim-gui/buttons/light/play.svg b/fmusim-gui/resources/buttons/light/play.svg
similarity index 100%
rename from fmusim-gui/buttons/light/play.svg
rename to fmusim-gui/resources/buttons/light/play.svg
diff --git a/fmusim-gui/buttons/light/side-bar.svg b/fmusim-gui/resources/buttons/light/side-bar.svg
similarity index 100%
rename from fmusim-gui/buttons/light/side-bar.svg
rename to fmusim-gui/resources/buttons/light/side-bar.svg
diff --git a/fmusim-gui/buttons/light/stop.svg b/fmusim-gui/resources/buttons/light/stop.svg
similarity index 100%
rename from fmusim-gui/buttons/light/stop.svg
rename to fmusim-gui/resources/buttons/light/stop.svg
diff --git a/fmusim-gui/app-icon.afdesign b/fmusim-gui/resources/icon/icon.afdesign
similarity index 100%
rename from fmusim-gui/app-icon.afdesign
rename to fmusim-gui/resources/icon/icon.afdesign
diff --git a/fmusim-gui/resources/app-icon.ico b/fmusim-gui/resources/icon/icon.ico
similarity index 100%
rename from fmusim-gui/resources/app-icon.ico
rename to fmusim-gui/resources/icon/icon.ico
diff --git a/fmusim-gui/resources/icon/icon.qrc b/fmusim-gui/resources/icon/icon.qrc
new file mode 100644
index 00000000..7baf1d39
--- /dev/null
+++ b/fmusim-gui/resources/icon/icon.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/icon/">
+        <file>icon.svg</file>
+    </qresource>
+</RCC>
diff --git a/fmusim-gui/resources/icon/icon.rc b/fmusim-gui/resources/icon/icon.rc
new file mode 100644
index 00000000..2c3fa656
--- /dev/null
+++ b/fmusim-gui/resources/icon/icon.rc
@@ -0,0 +1,2 @@
+IDI_ICON1		ICON		DISCARDABLE	"icon.ico"
+
diff --git a/fmusim-gui/fmusim.svg b/fmusim-gui/resources/icon/icon.svg
similarity index 100%
rename from fmusim-gui/fmusim.svg
rename to fmusim-gui/resources/icon/icon.svg
diff --git a/fmusim-gui/plot.html b/fmusim-gui/resources/plot/plot.html
similarity index 100%
rename from fmusim-gui/plot.html
rename to fmusim-gui/resources/plot/plot.html
diff --git a/fmusim-gui/plot.qrc b/fmusim-gui/resources/plot/plot.qrc
similarity index 75%
rename from fmusim-gui/plot.qrc
rename to fmusim-gui/resources/plot/plot.qrc
index 9a99b00b..16d0b6ee 100644
--- a/fmusim-gui/plot.qrc
+++ b/fmusim-gui/resources/plot/plot.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/">
         <file>plot.html</file>
         <file>plotly-2.32.0.js</file>
+        <file>plotly-2.33.0.min.js</file>
     </qresource>
 </RCC>
diff --git a/fmusim-gui/plotly-2.32.0.js b/fmusim-gui/resources/plot/plotly-2.32.0.js
similarity index 100%
rename from fmusim-gui/plotly-2.32.0.js
rename to fmusim-gui/resources/plot/plotly-2.32.0.js
diff --git a/fmusim-gui/plotly-2.33.0.min.js b/fmusim-gui/resources/plot/plotly-2.33.0.min.js
similarity index 100%
rename from fmusim-gui/plotly-2.33.0.min.js
rename to fmusim-gui/resources/plot/plotly-2.33.0.min.js
diff --git a/fmusim-gui/buttons/dark/broom.svg b/fmusim-gui/resources/tools/dark/broom.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/broom.svg
rename to fmusim-gui/resources/tools/dark/broom.svg
diff --git a/fmusim-gui/buttons/dark/checkers.png b/fmusim-gui/resources/tools/dark/checkers.png
similarity index 100%
rename from fmusim-gui/buttons/dark/checkers.png
rename to fmusim-gui/resources/tools/dark/checkers.png
diff --git a/fmusim-gui/buttons/dark/columns.svg b/fmusim-gui/resources/tools/dark/columns.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/columns.svg
rename to fmusim-gui/resources/tools/dark/columns.svg
diff --git a/fmusim-gui/buttons/dark/input-variable.svg b/fmusim-gui/resources/tools/dark/input-variable.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/input-variable.svg
rename to fmusim-gui/resources/tools/dark/input-variable.svg
diff --git a/fmusim-gui/buttons/dark/list.svg b/fmusim-gui/resources/tools/dark/list.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/list.svg
rename to fmusim-gui/resources/tools/dark/list.svg
diff --git a/fmusim-gui/buttons/dark/local-variable.svg b/fmusim-gui/resources/tools/dark/local-variable.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/local-variable.svg
rename to fmusim-gui/resources/tools/dark/local-variable.svg
diff --git a/fmusim-gui/buttons/dark/output-variable.svg b/fmusim-gui/resources/tools/dark/output-variable.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/output-variable.svg
rename to fmusim-gui/resources/tools/dark/output-variable.svg
diff --git a/fmusim-gui/buttons/dark/parameter.svg b/fmusim-gui/resources/tools/dark/parameter.svg
similarity index 100%
rename from fmusim-gui/buttons/dark/parameter.svg
rename to fmusim-gui/resources/tools/dark/parameter.svg
diff --git a/fmusim-gui/buttons/light/broom.svg b/fmusim-gui/resources/tools/light/broom.svg
similarity index 100%
rename from fmusim-gui/buttons/light/broom.svg
rename to fmusim-gui/resources/tools/light/broom.svg
diff --git a/fmusim-gui/buttons/light/columns.svg b/fmusim-gui/resources/tools/light/columns.svg
similarity index 100%
rename from fmusim-gui/buttons/light/columns.svg
rename to fmusim-gui/resources/tools/light/columns.svg
diff --git a/fmusim-gui/buttons/light/input-variable.svg b/fmusim-gui/resources/tools/light/input-variable.svg
similarity index 100%
rename from fmusim-gui/buttons/light/input-variable.svg
rename to fmusim-gui/resources/tools/light/input-variable.svg
diff --git a/fmusim-gui/buttons/light/list.svg b/fmusim-gui/resources/tools/light/list.svg
similarity index 100%
rename from fmusim-gui/buttons/light/list.svg
rename to fmusim-gui/resources/tools/light/list.svg
diff --git a/fmusim-gui/buttons/light/local-variable.svg b/fmusim-gui/resources/tools/light/local-variable.svg
similarity index 100%
rename from fmusim-gui/buttons/light/local-variable.svg
rename to fmusim-gui/resources/tools/light/local-variable.svg
diff --git a/fmusim-gui/buttons/light/output-variable.svg b/fmusim-gui/resources/tools/light/output-variable.svg
similarity index 100%
rename from fmusim-gui/buttons/light/output-variable.svg
rename to fmusim-gui/resources/tools/light/output-variable.svg
diff --git a/fmusim-gui/buttons/light/parameter.svg b/fmusim-gui/resources/tools/light/parameter.svg
similarity index 100%
rename from fmusim-gui/buttons/light/parameter.svg
rename to fmusim-gui/resources/tools/light/parameter.svg
diff --git a/fmusim-gui/buttons/toolbuttons.afdesign b/fmusim-gui/resources/tools/tools.afdesign
similarity index 100%
rename from fmusim-gui/buttons/toolbuttons.afdesign
rename to fmusim-gui/resources/tools/tools.afdesign
diff --git a/fmusim-gui/resources/tools/tools.qrc b/fmusim-gui/resources/tools/tools.qrc
new file mode 100644
index 00000000..63e73827
--- /dev/null
+++ b/fmusim-gui/resources/tools/tools.qrc
@@ -0,0 +1,19 @@
+<RCC>
+    <qresource prefix="/tools">
+        <file>dark/broom.svg</file>
+        <file>dark/checkers.png</file>
+        <file>dark/columns.svg</file>
+        <file>dark/input-variable.svg</file>
+        <file>dark/list.svg</file>
+        <file>dark/local-variable.svg</file>
+        <file>dark/output-variable.svg</file>
+        <file>dark/parameter.svg</file>
+        <file>light/broom.svg</file>
+        <file>light/columns.svg</file>
+        <file>light/input-variable.svg</file>
+        <file>light/list.svg</file>
+        <file>light/local-variable.svg</file>
+        <file>light/output-variable.svg</file>
+        <file>light/parameter.svg</file>
+    </qresource>
+</RCC>
diff --git a/fmusim-gui/icons/variables/dark/float-input.svg b/fmusim-gui/resources/variables/float-input.svg
similarity index 100%
rename from fmusim-gui/icons/variables/dark/float-input.svg
rename to fmusim-gui/resources/variables/float-input.svg
diff --git a/fmusim-gui/icons/variables/dark/float-output.svg b/fmusim-gui/resources/variables/float-output.svg
similarity index 100%
rename from fmusim-gui/icons/variables/dark/float-output.svg
rename to fmusim-gui/resources/variables/float-output.svg
diff --git a/fmusim-gui/icons/variables/dark/float-parameter.svg b/fmusim-gui/resources/variables/float-parameter.svg
similarity index 100%
rename from fmusim-gui/icons/variables/dark/float-parameter.svg
rename to fmusim-gui/resources/variables/float-parameter.svg
diff --git a/fmusim-gui/icons/variables/dark/float-variable.svg b/fmusim-gui/resources/variables/float-variable.svg
similarity index 100%
rename from fmusim-gui/icons/variables/dark/float-variable.svg
rename to fmusim-gui/resources/variables/float-variable.svg
diff --git a/fmusim-gui/icons/variables/dark/subsystem.svg b/fmusim-gui/resources/variables/subsystem.svg
similarity index 100%
rename from fmusim-gui/icons/variables/dark/subsystem.svg
rename to fmusim-gui/resources/variables/subsystem.svg
diff --git a/fmusim-gui/icons/variables/variables.afdesign b/fmusim-gui/resources/variables/variables.afdesign
similarity index 100%
rename from fmusim-gui/icons/variables/variables.afdesign
rename to fmusim-gui/resources/variables/variables.afdesign
diff --git a/fmusim-gui/resources/variables/variables.qrc b/fmusim-gui/resources/variables/variables.qrc
new file mode 100644
index 00000000..b363aba6
--- /dev/null
+++ b/fmusim-gui/resources/variables/variables.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/variables">
+        <file>float-input.svg</file>
+        <file>float-output.svg</file>
+        <file>float-parameter.svg</file>
+        <file>float-variable.svg</file>
+        <file>subsystem.svg</file>
+    </qresource>
+</RCC>