diff --git a/icons.toml b/icons.toml
index 0246c9f..f0612fc 100644
--- a/icons.toml
+++ b/icons.toml
@@ -1,10 +1,10 @@
 # Recommended: Specify your app ID *OR* your base resource path for more robust icon loading
-app_id = "org.tsuki.radar_g"
-base_resource_path = "/org/tsuki/radar_g"
+#app_id = "org.tsuki.radar_g"
 
 # List of icon names you found (shipped with this crate)
 # Note: the file ending `-symbolic.svg` isn't part of the icon name.
 icons = [
+    "plus",
     "add-filled",
     "delete-filled",
     "chevron-up-filled",
@@ -16,6 +16,3 @@ icons = [
     "settings-filled",
     "save-filled",
 ]
-
-# Optional: Specify a folder containing your own SVG icons
-icon_folder = "svg_icons"
diff --git a/src/main.rs b/src/main.rs
index d6fb273..47ac52e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,6 +22,7 @@ mod pipeline;
 mod plugin_system;
 use components::app::AppModel;
 use once_cell::{sync::Lazy as SafeLazy, unsync::Lazy as UnsafeLazy};
+use surfman::declare_surfman;
 use tracing::info;
 use tracing_subscriber;
 mod data_utils;
@@ -30,6 +31,8 @@ mod map_tile_utils;
 mod predefined;
 mod widgets;
 
+declare_surfman!();
+
 const APP_ID: &str = "org.tsuki.radar_g";
 static RUNTIME: SafeLazy<Runtime> =
     SafeLazy::new(|| Runtime::new().expect("Setting up tokio runtime needs to succeed."));
@@ -60,8 +63,8 @@ fn main() {
         });
     }
     let relm = relm4::RelmApp::new(APP_ID);
-    initialize_custom_css();
     relm4_icons::initialize_icons();
+    initialize_custom_css();
     info!("Init plugin system");
     let pluginmanager = PluginManager::new();
     relm.run::<AppModel>(());