diff --git a/src/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui
index 94d2f3e4a..3b173f591 100644
--- a/src/edt/edt/InstPropertiesPage.ui
+++ b/src/edt/edt/InstPropertiesPage.ui
@@ -731,7 +731,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../lay/lay/layResources.qrc">:/warn.png</pixmap>
+                <pixmap resource="../../lay/lay/layResources.qrc">:/warn_16px.png</pixmap>
                </property>
                <property name="alignment">
                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc
index 4edab8ab7..4afa93938 100644
--- a/src/edt/edt/edtPCellParametersPage.cc
+++ b/src/edt/edt/edtPCellParametersPage.cc
@@ -183,7 +183,7 @@ PCellParametersPage::init ()
   }
 
   mp_changed_icon = new QLabel (mp_update_frame);
-  mp_changed_icon->setPixmap (QPixmap (":/warn.png"));
+  mp_changed_icon->setPixmap (QPixmap (":/warn_16px.png"));
   update_frame_layout->addWidget (mp_changed_icon, 0, 0, 1, 1);
 
   mp_update_button = new QToolButton (mp_update_frame);
@@ -210,7 +210,7 @@ PCellParametersPage::init ()
   }
 
   mp_error_icon = new QLabel (mp_update_frame);
-  mp_error_icon->setPixmap (QPixmap (":/warn.png"));
+  mp_error_icon->setPixmap (QPixmap (":/warn_16px.png"));
   error_frame_layout->addWidget (mp_error_icon, 1, 0, 1, 1);
 
   mp_error_label = new QLabel (mp_update_frame);
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index b7ae4f671..2154ff27b 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -26,9 +26,12 @@
         <file alias="blue_flag_16px.png">images/blue_flag_16px.png</file>
         <file alias="blue_flag_16px@2x.png">images/blue_flag_16px@2x.png</file>
         <file alias="box.png">images/box.png</file>
-        <file alias="breakpoint.png">images/breakpoint.png</file>
-        <file alias="breakpointmark.png">images/breakpointmark.png</file>
-        <file alias="breakpointmarkdisabled.png">images/breakpointmarkdisabled.png</file>
+        <file alias="breakpoint_16px.png">images/breakpoint_16px.png</file>
+        <file alias="breakpoint_16px@2x.png">images/breakpoint_16px@2x.png</file>
+        <file alias="breakpointmark_16px.png">images/breakpointmark_16px.png</file>
+        <file alias="breakpointmark_16px@2x.png">images/breakpointmark_16px@2x.png</file>
+        <file alias="breakpointmarkdisabled_16px.png">images/breakpointmarkdisabled_16px.png</file>
+        <file alias="breakpointmarkdisabled_16px@2x.png">images/breakpointmarkdisabled_16px@2x.png</file>
         <file alias="bright.png">images/bright.png</file>
         <file alias="bulb.png">images/bulb.png</file>
         <file alias="cb.png">images/cb.png</file>
@@ -38,8 +41,10 @@
         <file alias="clear_16px@2x.png">images/clear_16px@2x.png</file>
         <file alias="clear_24px.png">images/clear_24px.png</file>
         <file alias="clear_24px@2x.png">images/clear_24px@2x.png</file>
-        <file alias="clear_edit.png">images/clear_edit.png</file>
-        <file alias="clearbreakpoints.png">images/clearbreakpoints.png</file>
+        <file alias="clear_edit_16px.png">images/clear_edit_16px.png</file>
+        <file alias="clear_edit_16px@2x.png">images/clear_edit_16px@2x.png</file>
+        <file alias="clearbreakpoints_16px.png">images/clearbreakpoints_16px.png</file>
+        <file alias="clearbreakpoints_16px@2x.png">images/clearbreakpoints_16px@2x.png</file>
         <file alias="close.png">images/close.png</file>
         <file alias="cm_add.png">images/cm_add.png</file>
         <file alias="cm_diff.png">images/cm_diff.png</file>
@@ -68,8 +73,10 @@
         <file alias="generalmacroiconactive.png">images/generalmacroiconactive.png</file>
         <file alias="green_flag_16px.png">images/green_flag_16px.png</file>
         <file alias="green_flag_16px@2x.png">images/green_flag_16px@2x.png</file>
-        <file alias="help.png">images/help.png</file>
-        <file alias="home.png">images/home.png</file>
+        <file alias="help_16px.png">images/help_16px.png</file>
+        <file alias="help_16px@2x.png">images/help_16px@2x.png</file>
+        <file alias="home_24px.png">images/home_24px.png</file>
+        <file alias="home_24px@2x.png">images/home_24px@2x.png</file>
         <file alias="import.png">images/import.png</file>
         <file alias="important.png">images/important.png</file>
         <file alias="instance.png">images/instance.png</file>
@@ -87,7 +94,8 @@
         <file alias="move_simple.png">images/move_simple.png</file>
         <file alias="neutral.png">images/neutral.png</file>
         <file alias="new_folder.png">images/new_folder.png</file>
-        <file alias="next_topic.png">images/next_topic.png</file>
+        <file alias="next_topic_24px.png">images/next_topic_24px.png</file>
+        <file alias="next_topic_24px@2x.png">images/next_topic_24px@2x.png</file>
         <file alias="nextstep.png">images/nextstep.png</file>
         <file alias="no_flag_16px.png">images/no_flag_16px.png</file>
         <file alias="no_flag_16px@2x.png">images/no_flag_16px@2x.png</file>
@@ -98,8 +106,10 @@
         <file alias="pause.png">images/pause.png</file>
         <file alias="photo.png">images/photo.png</file>
         <file alias="polygon.png">images/polygon.png</file>
-        <file alias="prev_topic.png">images/prev_topic.png</file>
-        <file alias="properties.png">images/properties.png</file>
+        <file alias="prev_topic_24px.png">images/prev_topic_24px.png</file>
+        <file alias="prev_topic_24px@2x.png">images/prev_topic_24px@2x.png</file>
+        <file alias="properties_16px.png">images/properties_16px.png</file>
+        <file alias="properties_16px@2x.png">images/properties_16px@2x.png</file>
         <file alias="r0.png">images/r0.png</file>
         <file alias="r180.png">images/r180.png</file>
         <file alias="r270.png">images/r270.png</file>
@@ -126,7 +136,8 @@
         <file alias="save.png">images/save.png</file>
         <file alias="save_all.png">images/save_all.png</file>
         <file alias="select.png">images/select.png</file>
-        <file alias="setup.png">images/setup.png</file>
+        <file alias="setup_16px.png">images/setup_16px.png</file>
+        <file alias="setup_16px@2x.png">images/setup_16px@2x.png</file>
         <file alias="singlestep.png">images/singlestep.png</file>
         <file alias="stop.png">images/stop.png</file>
         <file alias="techs.png">images/techs.png</file>
@@ -140,12 +151,16 @@
         <file alias="yellow_flag_16px@2x.png">images/yellow_flag_16px@2x.png</file>
         <file alias="salt.png">images/salt.png</file>
         <file alias="salt_icon.png">images/salt_icon.png</file>
-        <file alias="warn.png">images/warn.png</file>
-        <file alias="warn_16.png">images/warn_16.png</file>
-        <file alias="empty_16.png">images/empty_16.png</file>
-        <file alias="error_16.png">images/error_16.png</file>
-        <file alias="error2_16.png">images/error2_16.png</file>
-        <file alias="info_16.png">images/info_16.png</file>
+        <file alias="warn_16px.png">images/warn_16px.png</file>
+        <file alias="warn_16px@2x.png">images/warn_16px@2x.png</file>
+        <file alias="empty_16px.png">images/empty_16px.png</file>
+        <file alias="empty_16px@2x.png">images/empty_16px@2x.png</file>
+        <file alias="error_16px.png">images/error_16px.png</file>
+        <file alias="error_16px@2x.png">images/error_16px@2x.png</file>
+        <file alias="error2_16px.png">images/error2_16px.png</file>
+        <file alias="error2_16px@2x.png">images/error2_16px@2x.png</file>
+        <file alias="info_16px.png">images/info_16px.png</file>
+        <file alias="info_16px@2x.png">images/info_16px@2x.png</file>
         <file alias="marked_24.png">images/marked_24.png</file>
         <file alias="marked_64.png">images/marked_64.png</file>
         <file alias="marked_16.png">images/marked_16.png</file>
@@ -158,9 +173,13 @@
         <file alias="fit_right.png">images/fit_right.png</file>
         <file alias="fit_top.png">images/fit_top.png</file>
         <file alias="fit_bottom.png">images/fit_bottom.png</file>
-        <file alias="unlocked_16.png">images/unlocked_16.png</file>
-        <file alias="locked_16.png">images/locked_16.png</file>
-        <file alias="bookmark.png">images/bookmark.png</file>
-        <file alias="bookmark_16.png">images/bookmark_16.png</file>
+        <file alias="unlocked_16px.png">images/unlocked_16px.png</file>
+        <file alias="unlocked_16px@2x.png">images/unlocked_16px@2x.png</file>
+        <file alias="locked_16px.png">images/locked_16px.png</file>
+        <file alias="locked_16px@2x.png">images/locked_16px@2x.png</file>
+        <file alias="bookmark_16px.png">images/bookmark_16px.png</file>
+        <file alias="bookmark_16px@2x.png">images/bookmark_16px@2x.png</file>
+        <file alias="bookmark_24px.png">images/bookmark_24px.png</file>
+        <file alias="bookmark_24px@2x.png">images/bookmark_24px@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/icons/images/bookmark_16.png b/src/icons/images/bookmark_16.png
deleted file mode 100644
index 59767c43a..000000000
Binary files a/src/icons/images/bookmark_16.png and /dev/null differ
diff --git a/src/icons/images/bookmark_16px.png b/src/icons/images/bookmark_16px.png
new file mode 100644
index 000000000..5828f1018
Binary files /dev/null and b/src/icons/images/bookmark_16px.png differ
diff --git a/src/icons/images/bookmark_16px@2x.png b/src/icons/images/bookmark_16px@2x.png
new file mode 100644
index 000000000..179b552fa
Binary files /dev/null and b/src/icons/images/bookmark_16px@2x.png differ
diff --git a/src/icons/images/bookmark.png b/src/icons/images/bookmark_24px.png
similarity index 76%
rename from src/icons/images/bookmark.png
rename to src/icons/images/bookmark_24px.png
index c315058ce..50b208d0c 100644
Binary files a/src/icons/images/bookmark.png and b/src/icons/images/bookmark_24px.png differ
diff --git a/src/icons/images/bookmark_24px@2x.png b/src/icons/images/bookmark_24px@2x.png
new file mode 100644
index 000000000..bc21b96f5
Binary files /dev/null and b/src/icons/images/bookmark_24px@2x.png differ
diff --git a/src/icons/images/breakpoint.png b/src/icons/images/breakpoint.png
deleted file mode 100644
index 6e60f94b9..000000000
Binary files a/src/icons/images/breakpoint.png and /dev/null differ
diff --git a/src/icons/images/breakpoint_16px.png b/src/icons/images/breakpoint_16px.png
new file mode 100644
index 000000000..f66861638
Binary files /dev/null and b/src/icons/images/breakpoint_16px.png differ
diff --git a/src/icons/images/breakpoint_16px@2x.png b/src/icons/images/breakpoint_16px@2x.png
new file mode 100644
index 000000000..102e201e5
Binary files /dev/null and b/src/icons/images/breakpoint_16px@2x.png differ
diff --git a/src/icons/images/breakpointmark.png b/src/icons/images/breakpointmark.png
deleted file mode 100644
index efbd91de7..000000000
Binary files a/src/icons/images/breakpointmark.png and /dev/null differ
diff --git a/src/icons/images/breakpointmark_16px.png b/src/icons/images/breakpointmark_16px.png
new file mode 100644
index 000000000..182911cde
Binary files /dev/null and b/src/icons/images/breakpointmark_16px.png differ
diff --git a/src/icons/images/breakpointmark_16px@2x.png b/src/icons/images/breakpointmark_16px@2x.png
new file mode 100644
index 000000000..b364ddc90
Binary files /dev/null and b/src/icons/images/breakpointmark_16px@2x.png differ
diff --git a/src/icons/images/breakpointmarkdisabled.png b/src/icons/images/breakpointmarkdisabled.png
deleted file mode 100644
index 71e0bb1b9..000000000
Binary files a/src/icons/images/breakpointmarkdisabled.png and /dev/null differ
diff --git a/src/icons/images/breakpointmarkdisabled_16px.png b/src/icons/images/breakpointmarkdisabled_16px.png
new file mode 100644
index 000000000..a5b27f8e1
Binary files /dev/null and b/src/icons/images/breakpointmarkdisabled_16px.png differ
diff --git a/src/icons/images/breakpointmarkdisabled_16px@2x.png b/src/icons/images/breakpointmarkdisabled_16px@2x.png
new file mode 100644
index 000000000..3d51e719c
Binary files /dev/null and b/src/icons/images/breakpointmarkdisabled_16px@2x.png differ
diff --git a/src/icons/images/clear_edit.png b/src/icons/images/clear_edit.png
deleted file mode 100644
index 6e5e18e79..000000000
Binary files a/src/icons/images/clear_edit.png and /dev/null differ
diff --git a/src/icons/images/clear_edit_16px.png b/src/icons/images/clear_edit_16px.png
new file mode 100644
index 000000000..89adeadf4
Binary files /dev/null and b/src/icons/images/clear_edit_16px.png differ
diff --git a/src/icons/images/clear_edit_16px@2x.png b/src/icons/images/clear_edit_16px@2x.png
new file mode 100644
index 000000000..fe5d3f616
Binary files /dev/null and b/src/icons/images/clear_edit_16px@2x.png differ
diff --git a/src/icons/images/clearbreakpoints.png b/src/icons/images/clearbreakpoints.png
deleted file mode 100644
index 88ff597c2..000000000
Binary files a/src/icons/images/clearbreakpoints.png and /dev/null differ
diff --git a/src/icons/images/clearbreakpoints_16px.png b/src/icons/images/clearbreakpoints_16px.png
new file mode 100644
index 000000000..4070c5855
Binary files /dev/null and b/src/icons/images/clearbreakpoints_16px.png differ
diff --git a/src/icons/images/clearbreakpoints_16px@2x.png b/src/icons/images/clearbreakpoints_16px@2x.png
new file mode 100644
index 000000000..3239689ef
Binary files /dev/null and b/src/icons/images/clearbreakpoints_16px@2x.png differ
diff --git a/src/icons/images/empty_16px.png b/src/icons/images/empty_16px.png
new file mode 100644
index 000000000..1529b3495
Binary files /dev/null and b/src/icons/images/empty_16px.png differ
diff --git a/src/icons/images/empty_16px@2x.png b/src/icons/images/empty_16px@2x.png
new file mode 100644
index 000000000..c560efa2d
Binary files /dev/null and b/src/icons/images/empty_16px@2x.png differ
diff --git a/src/icons/images/empty_24px.png b/src/icons/images/empty_24px.png
new file mode 100644
index 000000000..ce5c57c6e
Binary files /dev/null and b/src/icons/images/empty_24px.png differ
diff --git a/src/icons/images/empty_24px@2x.png b/src/icons/images/empty_24px@2x.png
new file mode 100644
index 000000000..af3e114ad
Binary files /dev/null and b/src/icons/images/empty_24px@2x.png differ
diff --git a/src/icons/images/error2_16.png b/src/icons/images/error2_16.png
deleted file mode 100644
index f2b7ab6ea..000000000
Binary files a/src/icons/images/error2_16.png and /dev/null differ
diff --git a/src/icons/images/error2_16px.png b/src/icons/images/error2_16px.png
new file mode 100644
index 000000000..ea191969b
Binary files /dev/null and b/src/icons/images/error2_16px.png differ
diff --git a/src/icons/images/error2_16px@2x.png b/src/icons/images/error2_16px@2x.png
new file mode 100644
index 000000000..ee2dd2eef
Binary files /dev/null and b/src/icons/images/error2_16px@2x.png differ
diff --git a/src/icons/images/error_16.png b/src/icons/images/error_16.png
deleted file mode 100644
index c9dad1310..000000000
Binary files a/src/icons/images/error_16.png and /dev/null differ
diff --git a/src/icons/images/error_16px.png b/src/icons/images/error_16px.png
new file mode 100644
index 000000000..b4cba2d51
Binary files /dev/null and b/src/icons/images/error_16px.png differ
diff --git a/src/icons/images/error_16px@2x.png b/src/icons/images/error_16px@2x.png
new file mode 100644
index 000000000..7396d7191
Binary files /dev/null and b/src/icons/images/error_16px@2x.png differ
diff --git a/src/icons/images/help_16px.png b/src/icons/images/help_16px.png
new file mode 100644
index 000000000..66fef9562
Binary files /dev/null and b/src/icons/images/help_16px.png differ
diff --git a/src/icons/images/help_16px@2x.png b/src/icons/images/help_16px@2x.png
new file mode 100644
index 000000000..b78198a61
Binary files /dev/null and b/src/icons/images/help_16px@2x.png differ
diff --git a/src/icons/images/home.png b/src/icons/images/home_24px.png
similarity index 74%
rename from src/icons/images/home.png
rename to src/icons/images/home_24px.png
index 7cee0be19..70d8112d8 100644
Binary files a/src/icons/images/home.png and b/src/icons/images/home_24px.png differ
diff --git a/src/icons/images/home_24px@2x.png b/src/icons/images/home_24px@2x.png
new file mode 100644
index 000000000..540e3b484
Binary files /dev/null and b/src/icons/images/home_24px@2x.png differ
diff --git a/src/icons/images/info_16.png b/src/icons/images/info_16.png
deleted file mode 100644
index d1fa36644..000000000
Binary files a/src/icons/images/info_16.png and /dev/null differ
diff --git a/src/icons/images/info_16px.png b/src/icons/images/info_16px.png
new file mode 100644
index 000000000..20f1821c1
Binary files /dev/null and b/src/icons/images/info_16px.png differ
diff --git a/src/icons/images/info_16px@2x.png b/src/icons/images/info_16px@2x.png
new file mode 100644
index 000000000..5aad21af0
Binary files /dev/null and b/src/icons/images/info_16px@2x.png differ
diff --git a/src/icons/images/locked_16.png b/src/icons/images/locked_16.png
deleted file mode 100644
index 7d29dc559..000000000
Binary files a/src/icons/images/locked_16.png and /dev/null differ
diff --git a/src/icons/images/locked_16px.png b/src/icons/images/locked_16px.png
new file mode 100644
index 000000000..28e8887a2
Binary files /dev/null and b/src/icons/images/locked_16px.png differ
diff --git a/src/icons/images/locked_16px@2x.png b/src/icons/images/locked_16px@2x.png
new file mode 100644
index 000000000..bd36a53af
Binary files /dev/null and b/src/icons/images/locked_16px@2x.png differ
diff --git a/src/icons/images/next_topic.png b/src/icons/images/next_topic.png
deleted file mode 100644
index 2ba1acba3..000000000
Binary files a/src/icons/images/next_topic.png and /dev/null differ
diff --git a/src/icons/images/next_topic_24px.png b/src/icons/images/next_topic_24px.png
new file mode 100644
index 000000000..7ee95b93d
Binary files /dev/null and b/src/icons/images/next_topic_24px.png differ
diff --git a/src/icons/images/next_topic_24px@2x.png b/src/icons/images/next_topic_24px@2x.png
new file mode 100644
index 000000000..484db733b
Binary files /dev/null and b/src/icons/images/next_topic_24px@2x.png differ
diff --git a/src/icons/images/options_edit_16px.png b/src/icons/images/options_edit_16px.png
new file mode 100644
index 000000000..58a803870
Binary files /dev/null and b/src/icons/images/options_edit_16px.png differ
diff --git a/src/icons/images/options_edit_16px@2x.png b/src/icons/images/options_edit_16px@2x.png
new file mode 100644
index 000000000..606d9a783
Binary files /dev/null and b/src/icons/images/options_edit_16px@2x.png differ
diff --git a/src/icons/images/prev_topic.png b/src/icons/images/prev_topic_24px.png
similarity index 75%
rename from src/icons/images/prev_topic.png
rename to src/icons/images/prev_topic_24px.png
index 141bc71f8..0faf2b800 100644
Binary files a/src/icons/images/prev_topic.png and b/src/icons/images/prev_topic_24px.png differ
diff --git a/src/icons/images/prev_topic_24px@2x.png b/src/icons/images/prev_topic_24px@2x.png
new file mode 100644
index 000000000..e80b3e0d7
Binary files /dev/null and b/src/icons/images/prev_topic_24px@2x.png differ
diff --git a/src/icons/images/properties.png b/src/icons/images/properties.png
deleted file mode 100644
index 09a7d5c67..000000000
Binary files a/src/icons/images/properties.png and /dev/null differ
diff --git a/src/icons/images/properties_16px.png b/src/icons/images/properties_16px.png
new file mode 100644
index 000000000..c62c560b2
Binary files /dev/null and b/src/icons/images/properties_16px.png differ
diff --git a/src/icons/images/properties_16px@2x.png b/src/icons/images/properties_16px@2x.png
new file mode 100644
index 000000000..3bfe41ca1
Binary files /dev/null and b/src/icons/images/properties_16px@2x.png differ
diff --git a/src/icons/images/setup.png b/src/icons/images/setup.png
deleted file mode 100644
index ff05063a7..000000000
Binary files a/src/icons/images/setup.png and /dev/null differ
diff --git a/src/icons/images/setup_16px.png b/src/icons/images/setup_16px.png
new file mode 100644
index 000000000..0050b88af
Binary files /dev/null and b/src/icons/images/setup_16px.png differ
diff --git a/src/icons/images/setup_16px@2x.png b/src/icons/images/setup_16px@2x.png
new file mode 100644
index 000000000..01f3c0b22
Binary files /dev/null and b/src/icons/images/setup_16px@2x.png differ
diff --git a/src/icons/images/unlocked_16.png b/src/icons/images/unlocked_16.png
deleted file mode 100644
index 6b5b0d538..000000000
Binary files a/src/icons/images/unlocked_16.png and /dev/null differ
diff --git a/src/icons/images/unlocked_16px.png b/src/icons/images/unlocked_16px.png
new file mode 100644
index 000000000..aea7be797
Binary files /dev/null and b/src/icons/images/unlocked_16px.png differ
diff --git a/src/icons/images/unlocked_16px@2x.png b/src/icons/images/unlocked_16px@2x.png
new file mode 100644
index 000000000..7c709e287
Binary files /dev/null and b/src/icons/images/unlocked_16px@2x.png differ
diff --git a/src/icons/images/warn.png b/src/icons/images/warn.png
deleted file mode 100644
index adea92d4f..000000000
Binary files a/src/icons/images/warn.png and /dev/null differ
diff --git a/src/icons/images/warn_16.png b/src/icons/images/warn_16.png
deleted file mode 100644
index 357216719..000000000
Binary files a/src/icons/images/warn_16.png and /dev/null differ
diff --git a/src/icons/images/warn_16px.png b/src/icons/images/warn_16px.png
new file mode 100644
index 000000000..a92155bac
Binary files /dev/null and b/src/icons/images/warn_16px.png differ
diff --git a/src/icons/images/warn_16px@2x.png b/src/icons/images/warn_16px@2x.png
new file mode 100644
index 000000000..fc9dfa5f4
Binary files /dev/null and b/src/icons/images/warn_16px@2x.png differ
diff --git a/src/icons/svg/bookmark_16px.svg b/src/icons/svg/bookmark_16px.svg
new file mode 100644
index 000000000..0d50e6593
--- /dev/null
+++ b/src/icons/svg/bookmark_16px.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="bookmark_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="21.401557"
+     inkscape:cy="16.166852"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="605"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient1619-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.70370373,-0.69999986,0,-262.92653,108.79262)"
+       x1="82.237343"
+       y1="23.808168"
+       x2="100.84893"
+       y2="0.072931767" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       transform="scale(-1,1)"
+       inkscape:export-ydpi="27.093353"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark_16.png"
+       y="2.3115531e-07"
+       x="-4.2333331"
+       height="4.2333326"
+       width="4.2333322"
+       id="rect1566-1"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1619-6);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:3.54331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path1594-9"
+       sodipodi:sides="5"
+       sodipodi:cx="-272.17563"
+       sodipodi:cy="175.11702"
+       sodipodi:r1="25.11058"
+       sodipodi:r2="13.506786"
+       sodipodi:arg1="0.85196633"
+       sodipodi:arg2="1.4365972"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark_16.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       d="m -255.6402,194.01466 -14.72827,-5.5123 -14.67015,8.18048 0.69122,-15.71081 -12.31343,-11.42424 15.15547,-4.19752 7.06004,-15.24104 8.67537,13.11659 16.67677,2.00476 -9.79379,12.30402 z"
+       transform="matrix(0.07467128,0,0,0.07467127,22.489579,-10.847911)" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.44613;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path3282-4"
+       sodipodi:type="arc"
+       sodipodi:cx="3.3665838"
+       sodipodi:cy="-2.4328909"
+       sodipodi:rx="0.12252066"
+       sodipodi:ry="0.37089154"
+       sodipodi:start="0"
+       sodipodi:end="6.2811607"
+       sodipodi:open="true"
+       transform="matrix(0.20476678,0.97881079,-0.46349452,0.88609979,0,0)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark_16.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       sodipodi:arc-type="arc"
+       d="M 3.4891045,-2.4328909 A 0.12252066,0.37089154 0 0 1 3.3666458,-2.0619994 0.12252066,0.37089154 0 0 1 3.2440632,-2.4325154 0.12252066,0.37089154 0 0 1 3.3663978,-2.803782 0.12252066,0.37089154 0 0 1 3.4891042,-2.4336418" />
+    <path
+       transform="matrix(-0.98571407,-0.16842732,-0.72637991,-0.6872934,0,0)"
+       sodipodi:open="true"
+       sodipodi:end="6.2811607"
+       sodipodi:start="0"
+       sodipodi:ry="0.42034534"
+       sodipodi:rx="0.13718462"
+       sodipodi:cy="-3.4943163"
+       sodipodi:cx="1.5521241"
+       sodipodi:type="arc"
+       id="path3339-7"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.75566;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark_16.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       sodipodi:arc-type="arc"
+       d="m 1.6893088,-3.4943163 a 0.13718462,0.42034534 0 0 1 -0.1371152,0.4203452 0.13718462,0.42034534 0 0 1 -0.137254,-0.4199197 0.13718462,0.42034534 0 0 1 0.1369762,-0.4207704 0.13718462,0.42034534 0 0 1 0.1373927,0.4194938" />
+  </g>
+</svg>
diff --git a/src/icons/svg/bookmark_24px.svg b/src/icons/svg/bookmark_24px.svg
new file mode 100644
index 000000000..1535bf47d
--- /dev/null
+++ b/src/icons/svg/bookmark_24px.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="bookmark_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="9.7343196"
+     inkscape:cy="11.104486"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="128"
+     inkscape:window-y="136"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient1619"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.0555556,-1.0499998,0,589.42908,-380.7087)"
+       x1="82.237343"
+       y1="23.808168"
+       x2="100.84893"
+       y2="0.072931767" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       transform="scale(-1,1)"
+       inkscape:export-ydpi="27.093353"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark.png"
+       y="3.1525975e-08"
+       x="-6.3499999"
+       height="6.3499999"
+       width="6.3499999"
+       id="rect1566"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1619);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:3.54331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path1594"
+       sodipodi:sides="5"
+       sodipodi:cx="575.55542"
+       sodipodi:cy="-281.22211"
+       sodipodi:r1="37.665871"
+       sodipodi:r2="20.26018"
+       sodipodi:arg1="0.85196633"
+       sodipodi:arg2="1.4365972"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       d="m 600.35857,-252.87565 -22.09241,-8.26844 -22.00523,12.27072 1.03683,-23.56622 -18.47014,-17.13636 22.7332,-6.29628 10.59006,-22.86157 13.01306,19.6749 25.01516,3.00713 -14.69069,18.45604 z"
+       transform="matrix(0.0746713,0,0,0.07467129,-39.728657,24.341668)" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.44613;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path3282"
+       sodipodi:type="arc"
+       sodipodi:cx="5.0499001"
+       sodipodi:cy="-3.649354"
+       sodipodi:rx="0.18378101"
+       sodipodi:ry="0.55633742"
+       sodipodi:start="0"
+       sodipodi:end="6.2811607"
+       sodipodi:open="true"
+       transform="matrix(0.20476679,0.97881079,-0.46349456,0.88609977,0,0)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       sodipodi:arc-type="arc"
+       d="m 5.2336811,-3.649354 a 0.18378101,0.55633742 0 0 1 -0.183688,0.5563374 0.18378101,0.55633742 0 0 1 -0.183874,-0.5557742 0.18378101,0.55633742 0 0 1 0.1835019,-0.5569 0.18378101,0.55633742 0 0 1 0.1840597,0.5552105" />
+    <path
+       transform="matrix(-0.98571408,-0.16842731,-0.72637994,-0.68729337,0,0)"
+       sodipodi:open="true"
+       sodipodi:end="6.2811607"
+       sodipodi:start="0"
+       sodipodi:ry="0.63051814"
+       sodipodi:rx="0.205777"
+       sodipodi:cy="-5.2415023"
+       sodipodi:cx="2.328167"
+       sodipodi:type="arc"
+       id="path3339"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.75566;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/bookmark.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       sodipodi:arc-type="arc"
+       d="m 2.533944,-5.2415023 a 0.205777,0.63051814 0 0 1 -0.2056729,0.6305181 0.205777,0.63051814 0 0 1 -0.205881,-0.6298798 0.205777,0.63051814 0 0 1 0.2054644,-0.6311557 0.205777,0.63051814 0 0 1 0.206089,0.6292409" />
+  </g>
+</svg>
diff --git a/src/icons/svg/breakpoint_16px.svg b/src/icons/svg/breakpoint_16px.svg
new file mode 100644
index 000000000..3109cec7d
--- /dev/null
+++ b/src/icons/svg/breakpoint_16px.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="breakpoint_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="34.576923"
+     inkscape:cx="7.6929922"
+     inkscape:cy="6.0589544"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="311"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         id="stop4102"
+         offset="0"
+         style="stop-color:#ff5a5a;stop-opacity:1;" />
+      <stop
+         id="stop4104"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="radialGradient4098"
+       cx="822.32922"
+       cy="188.59673"
+       fx="822.32922"
+       fy="188.59673"
+       r="22.520477"
+       gradientTransform="matrix(0.1146472,-8.8834578e-8,6.2214504e-8,0.0802141,-92.418458,-13.268595)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       transform="scale(-1,1)"
+       inkscape:export-ydpi="25.400002"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpoint.png"
+       y="-4.3500085"
+       x="-14.270828"
+       height="15.000003"
+       width="15.000004"
+       id="rect3308"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       inkscape:export-ydpi="25.400002"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpoint.png"
+       y="1.4198501e-07"
+       x="-4.2333336"
+       height="4.2333331"
+       width="4.2333336"
+       id="rect3308-9"
+       style="fill:none;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4098);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.27678;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path3322"
+       sodipodi:cx="2.1174841"
+       sodipodi:cy="2.1175101"
+       sodipodi:rx="1.7162527"
+       sodipodi:ry="1.7154193"
+       sodipodi:start="0"
+       sodipodi:end="6.2826057"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpoint.png"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-ydpi="25.400002"
+       sodipodi:arc-type="arc"
+       d="M 3.8337368,2.1175101 A 1.7162527,1.7154193 0 0 1 2.1177328,3.8329294 1.7162527,1.7154193 0 0 1 0.40123148,2.1180072 1.7162527,1.7154193 0 0 1 2.116738,0.40209095 1.7162527,1.7154193 0 0 1 3.8337365,2.1165158" />
+  </g>
+</svg>
diff --git a/src/icons/svg/breakpointmark_16px.svg b/src/icons/svg/breakpointmark_16px.svg
new file mode 100644
index 000000000..bcd1a43b7
--- /dev/null
+++ b/src/icons/svg/breakpointmark_16px.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="breakpointmark_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="1.9632242"
+     inkscape:cy="12.822308"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="radialGradient4098-4"
+       cx="822.32922"
+       cy="188.59673"
+       fx="822.32922"
+       fy="188.59673"
+       r="22.520477"
+       gradientTransform="matrix(0.11699721,-9.033806e-8,6.3489762e-8,0.08157167,-94.349742,-13.529951)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         id="stop4102"
+         offset="0"
+         style="stop-color:#ff5a5a;stop-opacity:1;" />
+      <stop
+         id="stop4104"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       transform="scale(-1,1)"
+       inkscape:export-ydpi="25.400002"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpointmark.png"
+       y="4.9119961e-07"
+       x="-4.2333331"
+       height="4.2333326"
+       width="4.2333326"
+       id="rect3308-5"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.695473;fill:url(#radialGradient4098-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.216374;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path3322-0"
+       sodipodi:cx="2.1239774"
+       sodipodi:cy="2.1165581"
+       sodipodi:rx="1.7514321"
+       sodipodi:ry="1.7444521"
+       sodipodi:start="0"
+       sodipodi:end="6.2826057"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpointmark.png"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-ydpi="25.400002"
+       sodipodi:arc-type="arc"
+       d="M 3.8754095,2.1165581 A 1.7514321,1.7444521 0 0 1 2.1242312,3.8610102 1.7514321,1.7444521 0 0 1 0.37254544,2.1170636 1.7514321,1.7444521 0 0 1 2.1232161,0.37210612 1.7514321,1.7444521 0 0 1 3.8754092,2.115547" />
+  </g>
+</svg>
diff --git a/src/icons/svg/breakpointmarkdisabled_16px.svg b/src/icons/svg/breakpointmarkdisabled_16px.svg
new file mode 100644
index 000000000..561437552
--- /dev/null
+++ b/src/icons/svg/breakpointmarkdisabled_16px.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="breakpointmarkdisabled_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="6.50318"
+     inkscape:cy="4.7649086"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="75"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         id="stop4102"
+         offset="0"
+         style="stop-color:#ff5a5a;stop-opacity:1;" />
+      <stop
+         id="stop4104"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4155"
+       id="radialGradient4153"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.11478277,-8.9022264e-8,6.2288073e-8,0.08038356,-92.530292,-13.302694)"
+       cx="822.32922"
+       cy="188.59673"
+       fx="822.32922"
+       fy="188.59673"
+       r="22.520477" />
+    <linearGradient
+       id="linearGradient4155">
+      <stop
+         style="stop-color:#e5e5e5;stop-opacity:1;"
+         offset="0"
+         id="stop4157" />
+      <stop
+         style="stop-color:#7e7e7e;stop-opacity:1;"
+         offset="1"
+         id="stop4159" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4145"
+       width="4.2333326"
+       height="4.2333326"
+       x="-4.2333331"
+       y="5.3815847e-07"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpointmarkdisabled.png"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-ydpi="25.400002"
+       transform="scale(-1,1)" />
+    <path
+       inkscape:export-ydpi="25.400002"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/images/breakpointmarkdisabled.png"
+       sodipodi:open="true"
+       sodipodi:end="6.2826057"
+       sodipodi:start="0"
+       sodipodi:ry="1.7190437"
+       sodipodi:rx="1.7182821"
+       sodipodi:cy="2.1159189"
+       sodipodi:cx="2.1174374"
+       id="path4151"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.534979;fill:url(#radialGradient4153);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.270754;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       sodipodi:type="arc"
+       sodipodi:arc-type="arc"
+       d="M 3.8357195,2.1159189 A 1.7182821,1.7190437 0 0 1 2.1176863,3.8349626 1.7182821,1.7190437 0 0 1 0.39915533,2.1164171 1.7182821,1.7190437 0 0 1 2.1166904,0.39687531 1.7182821,1.7190437 0 0 1 3.8357192,2.1149225" />
+  </g>
+</svg>
diff --git a/src/icons/svg/clear_edit_16px.svg b/src/icons/svg/clear_edit_16px.svg
new file mode 100644
index 000000000..232bd9689
--- /dev/null
+++ b/src/icons/svg/clear_edit_16px.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="clear_edit_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="8.6442308"
+     inkscape:cx="12.72525"
+     inkscape:cy="22.731924"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="161"
+     inkscape:window-y="149"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="1.2801672"
+       height="1.2831836"
+       x="1.1047884"
+       y="1.5613081"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <ellipse
+       style="fill:#969696;fill-opacity:1;stroke:#787878;stroke-width:0.321553;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4520"
+       cx="2.1129456"
+       cy="2.1117213"
+       rx="1.6950281"
+       ry="1.6863614"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clear_edit.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#f0f0f0;stroke-width:0.640839;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.2795467,1.2897078 1.6450631,1.648932"
+       id="path4522"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clear_edit.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4524"
+       d="M 1.2795546,2.9386398 2.9246098,1.2897078"
+       style="fill:none;fill-rule:evenodd;stroke:#f0f0f0;stroke-width:0.640839;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clear_edit.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+  </g>
+</svg>
diff --git a/src/icons/svg/clearbreakpoints_16px.svg b/src/icons/svg/clearbreakpoints_16px.svg
new file mode 100644
index 000000000..e5114070c
--- /dev/null
+++ b/src/icons/svg/clearbreakpoints_16px.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="clearbreakpoints_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="10.225126"
+     inkscape:cy="14.949134"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="84"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100-5"
+       id="radialGradient4702"
+       cx="999.21259"
+       cy="159.44879"
+       fx="999.21259"
+       fy="159.44879"
+       r="21.259842"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07467126,0,0,0.07467127,-72.76039,-9.5249926)" />
+    <linearGradient
+       id="linearGradient4100-5">
+      <stop
+         style="stop-color:#ffcece;stop-opacity:1;"
+         offset="0"
+         id="stop4712" />
+      <stop
+         style="stop-color:#ff7373;stop-opacity:1;"
+         offset="1"
+         id="stop4714" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="radialGradient4686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.09756657,-7.5636347e-8,5.2945519e-8,0.06829661,-78.070324,-10.983511)"
+       cx="822.32922"
+       cy="188.59673"
+       fx="822.32922"
+       fy="188.59673"
+       r="22.520477" />
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         id="stop4102"
+         offset="0"
+         style="stop-color:#ff5a5a;stop-opacity:1;" />
+      <stop
+         id="stop4104"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="1.1947401"
+       height="1.1947403"
+       x="1.5748571"
+       y="1.899711"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4668"
+       width="4.2333331"
+       height="4.2333326"
+       x="-4.2333331"
+       y="2.4325587e-07"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clearbreakpoints.png"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-ydpi="25.400002"
+       transform="scale(-1,1)" />
+    <path
+       inkscape:export-ydpi="25.400002"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clearbreakpoints.png"
+       sodipodi:open="true"
+       sodipodi:end="6.2826057"
+       sodipodi:start="0"
+       sodipodi:ry="1.4605582"
+       sodipodi:rx="1.4605583"
+       sodipodi:cy="2.3812501"
+       sodipodi:cx="1.8520792"
+       id="path4674"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4702);fill-opacity:1;fill-rule:nonzero;stroke:#5f5f5f;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       sodipodi:type="arc"
+       sodipodi:arc-type="arc"
+       d="M 3.3126374,2.3812501 A 1.4605583,1.4605582 0 0 1 1.8522908,3.8418083 1.4605583,1.4605582 0 0 1 0.39152092,2.3816734 1.4605583,1.4605582 0 0 1 1.8514442,0.92069211 1.4605583,1.4605582 0 0 1 3.3126372,2.3804036" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4686);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path4684"
+       sodipodi:cx="2.3812454"
+       sodipodi:cy="2.1166673"
+       sodipodi:rx="1.4605583"
+       sodipodi:ry="1.4605582"
+       sodipodi:start="0"
+       sodipodi:end="6.2826057"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clearbreakpoints.png"
+       inkscape:export-xdpi="25.400002"
+       inkscape:export-ydpi="25.400002"
+       sodipodi:arc-type="arc"
+       d="M 3.8418037,2.1166673 A 1.4605583,1.4605582 0 0 1 2.381457,3.5772254 1.4605583,1.4605582 0 0 1 0.92068714,2.1170905 1.4605583,1.4605582 0 0 1 2.3806105,0.65610923 1.4605583,1.4605582 0 0 1 3.8418034,2.1158207" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d90000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 0.79376658,0.26459638 0.41370106,0.64480751 3.5886883,3.8197945 3.9687501,3.4395834 Z"
+       id="path5004"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/clearbreakpoints.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+  </g>
+</svg>
diff --git a/src/icons/svg/empty_16px.svg b/src/icons/svg/empty_16px.svg
new file mode 100644
index 000000000..f26d37c7f
--- /dev/null
+++ b/src/icons/svg/empty_16px.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="empty_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="34.576923"
+     inkscape:cx="5.3214683"
+     inkscape:cy="10.252503"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+  </g>
+</svg>
diff --git a/src/icons/svg/empty_24px.svg b/src/icons/svg/empty_24px.svg
new file mode 100644
index 000000000..d2e244e7c
--- /dev/null
+++ b/src/icons/svg/empty_24px.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="empty_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="19.319244"
+     inkscape:cy="6.5650723"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+  </g>
+</svg>
diff --git a/src/icons/svg/error2_16px.svg b/src/icons/svg/error2_16px.svg
new file mode 100644
index 000000000..47c402c79
--- /dev/null
+++ b/src/icons/svg/error2_16px.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="error2_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="12.224788"
+     inkscape:cx="14.805982"
+     inkscape:cy="9.9388224"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4711-3"
+       id="linearGradient5491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07817646,0,0,0.07817646,12.365786,-23.902817)"
+       x1="-155.90552"
+       y1="333.07083"
+       x2="-106.29921"
+       y2="333.07083" />
+    <linearGradient
+       id="linearGradient4711-3">
+      <stop
+         id="stop4721"
+         offset="0"
+         style="stop-color:#fb0000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff9898;stop-opacity:1;"
+         offset="1"
+         id="stop4723" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <ellipse
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/dvb/src/lay/lay/images/error2_16.png"
+       style="fill:url(#linearGradient5491);fill-opacity:1;stroke:#ffffff;stroke-width:0.373357;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="ellipse5489"
+       cx="2.116667"
+       cy="2.1354783"
+       rx="1.6654052"
+       ry="1.6654053" />
+    <ellipse
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/dvb/src/lay/lay/images/error2_16.png"
+       ry="1.7214085"
+       rx="1.7214084"
+       cy="2.1354783"
+       cx="2.116667"
+       id="ellipse4861"
+       style="fill:none;fill-opacity:1;stroke:#9b9b9b;stroke-width:0.26135;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       inkscape:export-ydpi="25.399982"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-filename="/home/matthias/klayout/dvb/src/lay/lay/images/error2_16.png"
+       y="0"
+       x="-4.4408921e-16"
+       height="4.2333336"
+       width="4.2333336"
+       id="rect4863"
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/dvb/src/lay/lay/images/error2_16.png"
+       y="1.8708977"
+       x="1.3229166"
+       height="0.52916658"
+       width="1.5874999"
+       id="rect4865"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26135;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <ellipse
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/dvb/src/lay/lay/images/error2_16.png"
+       transform="rotate(-33.683173)"
+       ry="0.13229166"
+       rx="0.66145825"
+       cy="1.7002666"
+       cx="0.6009357"
+       id="ellipse4867"
+       style="fill:#fdd9d9;fill-opacity:1;stroke:none;stroke-width:0.373358;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/icons/svg/error_16px.svg b/src/icons/svg/error_16px.svg
new file mode 100644
index 000000000..ae5cf44df
--- /dev/null
+++ b/src/icons/svg/error_16px.svg
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="error_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="11.047831"
+     inkscape:cy="13.332592"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4711-3"
+       id="linearGradient4745"
+       x1="-155.90552"
+       y1="333.07083"
+       x2="-106.29921"
+       y2="333.07083"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07817647,0,0,0.07817646,12.365785,-23.92163)" />
+    <linearGradient
+       id="linearGradient4711-3">
+      <stop
+         id="stop4721"
+         offset="0"
+         style="stop-color:#fb0000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff9898;stop-opacity:1;"
+         offset="1"
+         id="stop4723" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <circle
+       cy="2.1166673"
+       cx="2.1166661"
+       id="ellipse4737"
+       style="fill:url(#linearGradient4745);fill-opacity:1;stroke:#ffffff;stroke-width:0.373357;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/error_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25"
+       r="1.6654053" />
+    <ellipse
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26135;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4727"
+       cx="2.1166661"
+       cy="2.1166673"
+       rx="1.7214085"
+       ry="1.7214084"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/error_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4695"
+       width="4.2333336"
+       height="4.2333336"
+       x="4.4408921e-16"
+       y="-8.8817842e-16"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/error_16.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26135;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4725"
+       width="1.5875"
+       height="0.52916658"
+       x="1.3229156"
+       y="1.8520839"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/error_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <ellipse
+       style="fill:#fdd9d9;fill-opacity:1;stroke:none;stroke-width:0.373357;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4788"
+       cx="0.611287"
+       cy="1.6845435"
+       rx="0.66145831"
+       ry="0.13229166"
+       transform="rotate(-33.683172)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/error_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+  </g>
+</svg>
diff --git a/src/icons/svg/help_16px.svg b/src/icons/svg/help_16px.svg
new file mode 100644
index 000000000..a6def5985
--- /dev/null
+++ b/src/icons/svg/help_16px.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="help_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="7.2880979"
+     inkscape:cy="8.9365962"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="164"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4641"
+       id="radialGradient4647"
+       cx="-138.18898"
+       cy="162.99211"
+       fx="-138.18898"
+       fy="162.99211"
+       r="14.173228"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4999998,0,0,1.4999999,70.866165,-83.267684)" />
+    <linearGradient
+       id="linearGradient4641">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4643" />
+      <stop
+         style="stop-color:#ffea6d;stop-opacity:1;"
+         offset="1"
+         id="stop4645" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="25.399982"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+       y="4.4408921e-16"
+       x="4.4408921e-16"
+       height="4.2333336"
+       width="4.2333336"
+       id="rect4586"
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g4691"
+       transform="matrix(0.06995566,-0.02611528,0.02611528,0.06995565,6.6742845,-13.221753)"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25">
+      <circle
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         r="3.5433071"
+         cy="194.88188"
+         cx="-131.10237"
+         id="path4659"
+         style="opacity:1;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="ellipse4657"
+         cx="-131.10237"
+         cy="189.56693"
+         rx="10.129918"
+         ry="4.8149605" />
+      <ellipse
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="ellipse4653"
+         cx="-131.10237"
+         cy="186.02362"
+         rx="10.129918"
+         ry="4.8149614" />
+      <ellipse
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         ry="4.8149581"
+         rx="10.12992"
+         cy="182.4803"
+         cx="-131.10237"
+         id="path4651"
+         style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         ry="21.259842"
+         rx="21.25984"
+         cy="166.53542"
+         cx="-131.10237"
+         id="path4639"
+         style="opacity:1;fill:url(#radialGradient4647);fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         transform="rotate(10.074209)"
+         ry="1.7716535"
+         rx="7.0866141"
+         cy="174.82956"
+         cx="-100.72108"
+         id="path4649"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         style="opacity:0.604;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="ellipse4675"
+         cx="-131.10237"
+         cy="178.93698"
+         rx="10.12992"
+         ry="5.3149629" />
+      <ellipse
+         ry="19.459845"
+         rx="19.459839"
+         inkscape:export-ydpi="25"
+         inkscape:export-xdpi="25"
+         inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/help.png"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.6;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="ellipse4677"
+         cx="-131.10237"
+         cy="166.53542" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/home_24px.svg b/src/icons/svg/home_24px.svg
new file mode 100644
index 000000000..7e4e7a398
--- /dev/null
+++ b/src/icons/svg/home_24px.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="home_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="11.313709"
+     inkscape:cx="12.993087"
+     inkscape:cy="15.77732"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="140"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient3606-5-8"
+       x1="81.49604"
+       y1="180.70865"
+       x2="106.29919"
+       y2="155.90549"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.07881969,-0.07840485,0,16.232184,-4.0863426)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="1.7716732"
+       height="1.7682908"
+       x="-1.6473753e-07"
+       y="1.7494813e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-2-6"
+       width="6.3499999"
+       height="6.3499994"
+       x="-6.3499994"
+       y="1.7668896e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/home.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:url(#linearGradient3606-5-8);fill-opacity:1;stroke:#fe9212;stroke-width:0.264584;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.1750003,0.66145731 5.9531253,3.4542807 H 4.8418757 v 2.2342599 h -3.33375 V 3.4542807 H 0.39687661 Z"
+       id="path3598-3-2"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/home.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#333333;stroke-width:0.264584;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687801,3.4395816 3.1750028,0.66145589 5.9531281,3.4395816"
+       id="path2899"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/home.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#333333;stroke-width:0.264584;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.1906258,4.8947908 V 5.6885406 H 5.1593766 V 4.8947908"
+       id="path2901"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/home.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.09864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path3282-7"
+       sodipodi:type="arc"
+       sodipodi:cx="9.1187763"
+       sodipodi:cy="-8.8484554"
+       sodipodi:rx="0.37859944"
+       sodipodi:ry="1.0641091"
+       sodipodi:start="0"
+       sodipodi:end="6.2811607"
+       sodipodi:open="true"
+       transform="matrix(-0.47657204,0.87913542,-0.74536022,0.66666194,0,0)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/home.png"
+       inkscape:export-xdpi="27.093353"
+       inkscape:export-ydpi="27.093353"
+       sodipodi:arc-type="arc"
+       d="M 9.4973758,-8.8484554 A 0.37859944,1.0641091 0 0 1 9.118968,-7.7843465 0.37859944,1.0641091 0 0 1 8.7401771,-8.8473782 0.37859944,1.0641091 0 0 1 9.1182014,-9.9125633 0.37859944,1.0641091 0 0 1 9.497375,-8.8506098" />
+  </g>
+</svg>
diff --git a/src/icons/svg/info_16px.svg b/src/icons/svg/info_16px.svg
new file mode 100644
index 000000000..d0170eae3
--- /dev/null
+++ b/src/icons/svg/info_16px.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="info_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="5.8078715"
+     inkscape:cy="16.462453"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="132"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4711-3-3"
+       id="linearGradient4804"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07817646,0,0,0.07817646,12.365785,-23.921633)"
+       x1="-155.90552"
+       y1="333.07083"
+       x2="-106.29921"
+       y2="333.07083" />
+    <linearGradient
+       id="linearGradient4711-3-3">
+      <stop
+         style="stop-color:#bcbcbe;stop-opacity:1;"
+         offset="0"
+         id="stop4808" />
+      <stop
+         id="stop4810"
+         offset="1"
+         style="stop-color:#e4e4e4;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <ellipse
+       style="fill:url(#linearGradient4804);fill-opacity:1;stroke:none;stroke-width:0.373357;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="ellipse4790"
+       cx="2.1166658"
+       cy="2.116667"
+       rx="1.6654052"
+       ry="1.6654054"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/info_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <ellipse
+       ry="1.7214086"
+       rx="1.7214085"
+       cy="2.116667"
+       cx="2.1166658"
+       id="ellipse4792"
+       style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.26135;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/info_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       inkscape:export-ydpi="25.399982"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/info_16.png"
+       y="4.4408921e-16"
+       x="-1.3322676e-15"
+       height="4.2333336"
+       width="4.2333336"
+       id="rect4794"
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-33.683175)"
+       ry="0.13229164"
+       rx="0.66145831"
+       cy="1.5570781"
+       cx="0.60876"
+       id="ellipse4802"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.373357;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/info_16.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <path
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/info_16.png"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path4812"
+       d="M 1.8520821,3.1750004 H 2.1323205 2.3812484 V 1.8520835 H 2.1166649 1.8520821 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.074671px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <circle
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/info_16.png"
+       cy="-1.3229156"
+       cx="2.1166649"
+       id="circle4814"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26135;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="scale(1,-1)"
+       r="0.26458332" />
+  </g>
+</svg>
diff --git a/src/icons/svg/locked_16px.svg b/src/icons/svg/locked_16px.svg
new file mode 100644
index 000000000..cdd51d93a
--- /dev/null
+++ b/src/icons/svg/locked_16px.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="locked_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="9.3704113"
+     inkscape:cy="9.2836483"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect851"
+       width="2.3814235"
+       height="1.8522556"
+       x="0.92595309"
+       y="1.9842902"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.1151107,0.52914383 C 1.5327299,0.53002436 1.0583073,1.0052636 1.0583372,1.5875212 H 1.3227489 C 1.3226967,1.1479851 1.6757762,0.79422389 2.1154027,0.79355558 2.5552748,0.79288388 2.9096446,1.1460399 2.9105354,1.5859173 a 0.13221874,0.13221873 0 0 0 0,7.458e-4 0.13221874,0.13221873 0 0 0 0,8.76e-4 h 0.2644118 a 0.13221874,0.13221873 0 0 0 0,-7.459e-4 0.13221874,0.13221873 0 0 0 0,-0.00146 c -7e-7,-3.734e-4 -1.493e-4,-6.721e-4 -1.493e-4,-0.00102 a 0.13221874,0.13221873 0 0 0 -0.00263,-0.025378 C 3.156584,0.98865151 2.6887841,0.52827088 2.115104,0.52914231 Z"
+       id="path853"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect855"
+       width="0.2645832"
+       height="0.26458368"
+       x="1.0583324"
+       y="1.5874988"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="1.1947405"
+       height="1.1947405"
+       x="1.4696121"
+       y="1.4781405"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1620"
+       width="4.2333336"
+       height="4.2333336"
+       x="-4.4408921e-16"
+       y="8.8817842e-16"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#282828;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect1632"
+       width="2.3814235"
+       height="1.8522556"
+       x="0.92595309"
+       y="1.9842902"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.1151107,0.52914383 C 1.5327299,0.53002436 1.0583073,1.0052636 1.0583372,1.5875212 H 1.3227489 C 1.3226967,1.1479851 1.6757762,0.79422389 2.1154027,0.79355558 2.5552748,0.79288388 2.9096446,1.1460399 2.9105354,1.5859173 a 0.13221874,0.13221873 0 0 0 0,7.458e-4 0.13221874,0.13221873 0 0 0 0,8.76e-4 h 0.2644118 a 0.13221874,0.13221873 0 0 0 0,-7.459e-4 0.13221874,0.13221873 0 0 0 0,-0.00146 c -7e-7,-3.734e-4 -1.493e-4,-6.721e-4 -1.493e-4,-0.00102 a 0.13221874,0.13221873 0 0 0 -0.00263,-0.025378 C 3.156584,0.98865151 2.6887841,0.52827088 2.115104,0.52914231 Z"
+       id="path1634"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect1643"
+       width="0.2645832"
+       height="0.26458368"
+       x="1.0583324"
+       y="1.5874988"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect1643-8"
+       width="0.2645832"
+       height="0.26458368"
+       x="2.9104166"
+       y="1.5874988"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e9e9e9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path1668"
+       sodipodi:type="arc"
+       sodipodi:cx="2.1210105"
+       sodipodi:cy="2.6458311"
+       sodipodi:rx="0.26023939"
+       sodipodi:ry="0.26458362"
+       sodipodi:start="0"
+       sodipodi:end="6.2811607"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332"
+       sodipodi:arc-type="arc"
+       d="M 2.3812499,2.6458311 A 0.26023939,0.26458362 0 0 1 2.1211423,2.9104147 0.26023939,0.26458362 0 0 1 1.8607713,2.6460989 0.26023939,0.26458362 0 0 1 2.1206154,2.3812478 0.26023939,0.26458362 0 0 1 2.3812494,2.6452954" />
+    <path
+       style="fill:#e9e9e9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0746713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.1253533,2.6458306 1.8607705,3.4395812 h 0.5291664 z"
+       id="path1670"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/locked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+  </g>
+</svg>
diff --git a/src/icons/svg/next_topic_24px.svg b/src/icons/svg/next_topic_24px.svg
new file mode 100644
index 000000000..ef0371f56
--- /dev/null
+++ b/src/icons/svg/next_topic_24px.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="next_topic_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="10.961335"
+     inkscape:cy="16.748756"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="118"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient3606-3-1"
+       x1="81.47274"
+       y1="173.62981"
+       x2="92.125977"
+       y2="155.9055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.06844868,0,0,0.06844869,9.8667523,-7.9595487)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-8-0"
+       width="5.8208332"
+       height="5.8208332"
+       x="-6.3499999"
+       y="0.5291667"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/next_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:url(#linearGradient3606-3-1);fill-opacity:1;stroke:#333333;stroke-width:0.242535;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 5.7436622,3.4395828 3.3183149,1.0142355 V 1.9843739 4.894791 5.8649299 Z"
+       id="path3598-38-3"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/next_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <rect
+       y="3.0757816"
+       x="2.348177"
+       height="0.72760391"
+       width="0.97013867"
+       id="rect3333"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.242535;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/next_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09" />
+    <path
+       transform="matrix(-0.47657199,0.87913545,-0.74536018,0.66666198,0,0)"
+       sodipodi:open="true"
+       sodipodi:end="6.2811607"
+       sodipodi:start="0"
+       sodipodi:ry="0.97543341"
+       sodipodi:rx="0.3470495"
+       sodipodi:cy="-17.464952"
+       sodipodi:cx="18.027632"
+       sodipodi:type="arc"
+       id="path3337"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.09864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/next_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       sodipodi:arc-type="arc"
+       d="m 18.374681,-17.464952 a 0.3470495,0.97543341 0 0 1 -0.346874,0.975433 0.3470495,0.97543341 0 0 1 -0.347225,-0.974446 0.3470495,0.97543341 0 0 1 0.346523,-0.97642 0.3470495,0.97543341 0 0 1 0.347576,0.973458" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:0.29433;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3761-2"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/next_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       cx="1.9843752"
+       cy="3.4395833"
+       rx="0.82297409"
+       ry="0.82297415" />
+  </g>
+</svg>
diff --git a/src/icons/svg/options_edit_16px.svg b/src/icons/svg/options_edit_16px.svg
new file mode 100644
index 000000000..27df65abe
--- /dev/null
+++ b/src/icons/svg/options_edit_16px.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="options_edit_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="12.224788"
+     inkscape:cx="3.7628463"
+     inkscape:cy="10.511429"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="81"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="3.968749"
+       height="3.9669619"
+       x="0.13229214"
+       y="0.13318616"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="25.399982"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/options_edit.png"
+       y="0.195833"
+       x="0.029154362"
+       height="14.062495"
+       width="14.062496"
+       id="rect4526"
+       style="fill:none;fill-opacity:1;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.7800632"
+       inkscape:original="M 1410.3574 277.87695 L 1407.3359 284.49023 A 14.90646 14.985372 0 0 0 1403.8398 285.20117 L 1398.6719 280.15234 A 21.531579 21.645545 0 0 0 1390.8848 286.95312 L 1395.0723 292.89258 A 14.90646 14.985372 0 0 0 1393.9414 296.11719 L 1387 298.0918 A 21.531579 21.645545 0 0 0 1386.9316 299.42969 A 21.531579 21.645545 0 0 0 1388.8535 308.29883 L 1395.9941 307.63086 A 14.90646 14.985372 0 0 0 1398.2598 310.32617 L 1396.4785 317.40039 A 21.531579 21.645545 0 0 0 1406.1465 320.94141 L 1409.1406 314.39062 A 14.90646 14.985372 0 0 0 1412.8574 313.73242 L 1418.0469 318.80273 A 21.531579 21.645545 0 0 0 1425.8672 312.13477 L 1421.7188 306.25 A 14.90646 14.985372 0 0 0 1423.043 302.52344 L 1429.9395 300.56055 A 21.531579 21.645545 0 0 0 1429.9961 299.42969 A 21.531579 21.645545 0 0 0 1428.0215 290.4375 L 1420.8477 291.10938 A 14.90646 14.985372 0 0 0 1418.3262 288.21094 L 1420.082 281.23242 A 21.531579 21.645545 0 0 0 1410.3574 277.87695 z "
+       style="opacity:1;fill:#969696;fill-opacity:1;stroke:#787878;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4584"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/options_edit.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25"
+       d="m 1411.3867,279.90625 -2.4316,5.32422 a 1.7802412,1.7802412 0 0 1 -1.4766,1.0332 c -1.0454,0.0839 -2.0803,0.29572 -3.0762,0.62695 a 1.7802412,1.7802412 0 0 1 -1.8066,-0.41601 l -4.1367,-4.04102 c -2.0341,1.21777 -3.8275,2.78444 -5.3086,4.64258 l 3.3769,4.79102 a 1.7802412,1.7802412 0 0 1 0.1465,1.80078 c -0.4386,0.90515 -0.7729,1.86192 -0.9961,2.84375 a 1.7802412,1.7802412 0 0 1 -1.25,1.31836 l -5.7129,1.625 c 0.012,2.37676 0.5376,4.72007 1.377,6.9414 l 5.7363,-0.5371 a 1.7802412,1.7802412 0 0 1 1.6543,0.79492 c 0.5695,0.86705 1.2411,1.66622 1.9961,2.375 a 1.7802412,1.7802412 0 0 1 0.5078,1.73242 l -1.4375,5.71094 c 2.0352,1.19507 4.2568,2.00835 6.5782,2.41406 l 2.3945,-5.23633 a 1.7802412,1.7802412 0 0 1 1.5351,-1.03711 c 1.1088,-0.0529 2.2094,-0.24888 3.2696,-0.58008 a 1.7802412,1.7802412 0 0 1 1.7754,0.42578 l 4.1699,4.07422 c 2.0299,-1.18458 3.826,-2.71613 5.3203,-4.53711 l -3.3281,-4.7207 a 1.7802412,1.7802412 0 0 1 -0.1289,-1.83594 c 0.531,-1.03672 0.9253,-2.1464 1.1679,-3.28711 a 1.7802412,1.7802412 0 0 1 1.2539,-1.34179 l 5.6348,-1.60352 c -0.034,-2.3541 -0.5552,-4.67207 -1.4004,-6.86719 l -5.7773,0.54102 a 1.7802412,1.7802412 0 0 1 -1.6485,-0.78516 c -0.6274,-0.94264 -1.3754,-1.80236 -2.2207,-2.55273 a 1.7802412,1.7802412 0 0 1 -0.5449,-1.76563 l 1.4063,-5.58984 c -2.0575,-1.15262 -4.2917,-1.92264 -6.6192,-2.28125 z"
+       transform="matrix(0.09339192,0,0,0.09453809,-129.42147,-26.187706)" />
+    <ellipse
+       style="fill:#f0f0f0;fill-opacity:1;stroke:none;stroke-width:0.375851;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4577"
+       cx="2.1177382"
+       cy="2.1178908"
+       rx="0.4963764"
+       ry="0.50246555"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/options_edit.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+  </g>
+</svg>
diff --git a/src/icons/svg/prev_topic_24px.svg b/src/icons/svg/prev_topic_24px.svg
new file mode 100644
index 000000000..d87904a9e
--- /dev/null
+++ b/src/icons/svg/prev_topic_24px.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="prev_topic_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="4.3221155"
+     inkscape:cx="13.419354"
+     inkscape:cy="-13.30367"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient3606-3"
+       x1="81.872917"
+       y1="176.81956"
+       x2="67.322823"
+       y2="155.9055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07467129,0,0,0.0746713,-3.8364583,-9.2604165)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-8"
+       width="6.3499994"
+       height="6.3499994"
+       x="4.5305306e-08"
+       y="4.5305306e-08"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/prev_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09" />
+    <path
+       style="fill:url(#linearGradient3606-3);fill-opacity:1;stroke:#333333;stroke-width:0.264584;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.6614572,3.1749992 3.3072905,0.52916594 V 1.5874986 4.7624989 5.8208323 Z"
+       id="path3598-38"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/prev_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:0.321087;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3761"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/prev_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       cx="4.7624989"
+       cy="3.1749997"
+       rx="0.8977899"
+       ry="0.89779001" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.264584;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect3331"
+       width="0.52916634"
+       height="0.79374969"
+       x="3.3072913"
+       y="2.7781253"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/prev_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09" />
+    <path
+       transform="matrix(0.47657198,0.87913545,0.74536017,0.66666199,0,0)"
+       sodipodi:open="true"
+       sodipodi:end="6.2811607"
+       sodipodi:start="0"
+       sodipodi:ry="1.0641092"
+       sodipodi:rx="0.37859946"
+       sodipodi:cy="-0.24009967"
+       sodipodi:cx="4.8588014"
+       sodipodi:type="arc"
+       id="path3335"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.09864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/prev_topic.png"
+       inkscape:export-xdpi="27.09"
+       inkscape:export-ydpi="27.09"
+       sodipodi:arc-type="arc"
+       d="M 5.2374008,-0.24009967 A 0.37859946,1.0641092 0 0 1 4.858993,0.8240094 0.37859946,1.0641092 0 0 1 4.4802021,-0.23902247 0.37859946,1.0641092 0 0 1 4.8582265,-1.3042076 0.37859946,1.0641092 0 0 1 5.2374001,-0.24225407" />
+  </g>
+</svg>
diff --git a/src/icons/svg/properties_16px.svg b/src/icons/svg/properties_16px.svg
new file mode 100644
index 000000000..9e7e81da2
--- /dev/null
+++ b/src/icons/svg/properties_16px.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="properties_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="12.224788"
+     inkscape:cx="5.2352645"
+     inkscape:cy="9.9388224"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="116"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4099"
+       id="linearGradient5092"
+       x1="974.40942"
+       y1="432.28345"
+       x2="1009.8425"
+       y2="467.71652"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07471287,0,0,0.07467132,-72.803281,-30.691673)" />
+    <linearGradient
+       id="linearGradient4099">
+      <stop
+         id="stop4101"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff9e3f;stop-opacity:1;"
+         offset="0.65753424"
+         id="stop4485" />
+      <stop
+         id="stop4103"
+         offset="1"
+         style="stop-color:#808080;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="25.399982"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       y="2.9657011e-07"
+       x="-0.0023580033"
+       height="4.2333326"
+       width="4.2356915"
+       id="rect5066"
+       style="fill:none;fill-opacity:1;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="fill:url(#linearGradient5092);fill-opacity:1;stroke:#464646;stroke-width:0.268892;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5080"
+       width="3.1725297"
+       height="3.9645174"
+       x="0.13212885"
+       y="0.13441007"
+       rx="0.3942419"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25"
+       ry="0.39475662" />
+    <rect
+       y="1.3229185"
+       x="0.52710289"
+       height="0.26458341"
+       width="1.8531166"
+       id="rect5096"
+       style="fill:#838383;fill-opacity:1;stroke:none;stroke-width:0.672226;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:#838383;fill-opacity:1;stroke:none;stroke-width:0.672226;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5098"
+       width="2.1178474"
+       height="0.26458341"
+       x="0.52710289"
+       y="1.852085"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       y="2.3812516"
+       x="0.52710289"
+       height="0.26458341"
+       width="2.1178474"
+       id="rect5100"
+       style="fill:#838383;fill-opacity:1;stroke:none;stroke-width:0.672226;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:#838383;fill-opacity:1;stroke:none;stroke-width:0.672226;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5094"
+       width="2.3825777"
+       height="0.26458341"
+       x="0.52710289"
+       y="0.79375219"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5082"
+       d="M 1.3213019,1.8520849 V 2.1166685 L 1.8507666,2.645835 h 0.529452 L 3.439139,3.7041688 H 3.7038766 L 3.7038691,3.4395851 2.6449487,2.3812522 V 1.8520849 L 2.1154885,1.3229184 H 1.8507666 l 0.529452,0.5291665 V 2.1166685 L 2.1154885,2.3812522 H 1.8507666 Z"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.896305;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <path
+       style="fill:#464646;fill-opacity:1;fill-rule:evenodd;stroke:#464646;stroke-width:0.448153;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.3213019,1.8520849 V 2.1166685 L 1.8507666,2.645835 h 0.529452 L 3.439139,3.7041688 H 3.7038766 L 3.7038691,3.4395851 2.6449487,2.3812522 V 1.8520849 L 2.1154885,1.3229184 H 1.8507666 l 0.529452,0.5291665 V 2.1166685 L 2.1154885,2.3812522 H 1.8507666 Z"
+       id="path5078"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccc"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:#838383;fill-opacity:1;stroke:none;stroke-width:0.672226;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5102"
+       width="0.79419404"
+       height="0.26458341"
+       x="0.52710289"
+       y="2.9104178"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/properties.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+  </g>
+</svg>
diff --git a/src/icons/svg/setup_16px.svg b/src/icons/svg/setup_16px.svg
new file mode 100644
index 000000000..2aa742023
--- /dev/null
+++ b/src/icons/svg/setup_16px.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="setup_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="4.0082493"
+     inkscape:cy="13.108611"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="79"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4099"
+       id="radialGradient5064"
+       cx="1408.4531"
+       cy="299.39648"
+       fx="1408.4531"
+       fy="299.39648"
+       r="21.238298"
+       gradientTransform="matrix(1,0,0,0.98831919,0,3.4971931)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4099">
+      <stop
+         id="stop4101"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff9e3f;stop-opacity:1;"
+         offset="0.65753424"
+         id="stop4485" />
+      <stop
+         id="stop4103"
+         offset="1"
+         style="stop-color:#808080;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/setup.png"
+       id="path906"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#fefefe;stroke-width:5.56391;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       inkscape:original="M 1410.3574 277.87695 L 1407.3359 284.49023 A 14.90646 14.985372 0 0 0 1403.8398 285.20117 L 1398.6719 280.15234 A 21.531579 21.645545 0 0 0 1390.8848 286.95312 L 1395.0723 292.89258 A 14.90646 14.985372 0 0 0 1393.9414 296.11719 L 1387 298.0918 A 21.531579 21.645545 0 0 0 1386.9316 299.42969 A 21.531579 21.645545 0 0 0 1388.8535 308.29883 L 1395.9941 307.63086 A 14.90646 14.985372 0 0 0 1398.2598 310.32617 L 1396.4785 317.40039 A 21.531579 21.645545 0 0 0 1406.1465 320.94141 L 1409.1406 314.39062 A 14.90646 14.985372 0 0 0 1412.8574 313.73242 L 1418.0469 318.80273 A 21.531579 21.645545 0 0 0 1425.8672 312.13477 L 1421.7188 306.25 A 14.90646 14.985372 0 0 0 1423.043 302.52344 L 1429.9395 300.56055 A 21.531579 21.645545 0 0 0 1429.9961 299.42969 A 21.531579 21.645545 0 0 0 1428.0215 290.4375 L 1420.8477 291.10938 A 14.90646 14.985372 0 0 0 1418.3262 288.21094 L 1420.082 281.23242 A 21.531579 21.645545 0 0 0 1410.3574 277.87695 z "
+       inkscape:radius="-1.7800632"
+       sodipodi:type="inkscape:offset"
+       transform="matrix(0.0939853,0,0,0.09502117,-130.25697,-26.332553)"
+       d="m 1411.3867,279.90625 -2.4316,5.32422 a 1.7802412,1.7802412 0 0 1 -1.4766,1.0332 c -1.0454,0.0839 -2.0803,0.29572 -3.0762,0.62695 a 1.7802412,1.7802412 0 0 1 -1.8066,-0.41601 l -4.1367,-4.04102 c -2.0341,1.21777 -3.8275,2.78444 -5.3086,4.64258 l 3.3769,4.79102 a 1.7802412,1.7802412 0 0 1 0.1465,1.80078 c -0.4386,0.90515 -0.7729,1.86192 -0.9961,2.84375 a 1.7802412,1.7802412 0 0 1 -1.25,1.31836 l -5.7129,1.625 c 0.012,2.37676 0.5376,4.72007 1.377,6.9414 l 5.7363,-0.5371 a 1.7802412,1.7802412 0 0 1 1.6543,0.79492 c 0.5695,0.86705 1.2411,1.66622 1.9961,2.375 a 1.7802412,1.7802412 0 0 1 0.5078,1.73242 l -1.4375,5.71094 c 2.0352,1.19507 4.2568,2.00835 6.5782,2.41406 l 2.3945,-5.23633 a 1.7802412,1.7802412 0 0 1 1.5351,-1.03711 c 1.1088,-0.0529 2.2094,-0.24888 3.2696,-0.58008 a 1.7802412,1.7802412 0 0 1 1.7754,0.42578 l 4.1699,4.07422 c 2.0299,-1.18458 3.826,-2.71613 5.3203,-4.53711 l -3.3281,-4.7207 a 1.7802412,1.7802412 0 0 1 -0.1289,-1.83594 c 0.531,-1.03672 0.9253,-2.1464 1.1679,-3.28711 a 1.7802412,1.7802412 0 0 1 1.2539,-1.34179 l 5.6348,-1.60352 c -0.034,-2.3541 -0.5552,-4.67207 -1.4004,-6.86719 l -5.7773,0.54102 a 1.7802412,1.7802412 0 0 1 -1.6485,-0.78516 c -0.6274,-0.94264 -1.3754,-1.80236 -2.2207,-2.55273 a 1.7802412,1.7802412 0 0 1 -0.5449,-1.76563 l 1.4063,-5.58984 c -2.0575,-1.15262 -4.2917,-1.92264 -6.6192,-2.28125 z" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5048"
+       width="4.2333326"
+       height="4.2333326"
+       x="4.9903184e-07"
+       y="4.9903184e-07"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/setup.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <path
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/setup.png"
+       id="path5054"
+       style="opacity:1;fill:url(#radialGradient5064);fill-opacity:1;stroke:#000000;stroke-width:2.52505;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:original="M 1410.3574 277.87695 L 1407.3359 284.49023 A 14.90646 14.985372 0 0 0 1403.8398 285.20117 L 1398.6719 280.15234 A 21.531579 21.645545 0 0 0 1390.8848 286.95312 L 1395.0723 292.89258 A 14.90646 14.985372 0 0 0 1393.9414 296.11719 L 1387 298.0918 A 21.531579 21.645545 0 0 0 1386.9316 299.42969 A 21.531579 21.645545 0 0 0 1388.8535 308.29883 L 1395.9941 307.63086 A 14.90646 14.985372 0 0 0 1398.2598 310.32617 L 1396.4785 317.40039 A 21.531579 21.645545 0 0 0 1406.1465 320.94141 L 1409.1406 314.39062 A 14.90646 14.985372 0 0 0 1412.8574 313.73242 L 1418.0469 318.80273 A 21.531579 21.645545 0 0 0 1425.8672 312.13477 L 1421.7188 306.25 A 14.90646 14.985372 0 0 0 1423.043 302.52344 L 1429.9395 300.56055 A 21.531579 21.645545 0 0 0 1429.9961 299.42969 A 21.531579 21.645545 0 0 0 1428.0215 290.4375 L 1420.8477 291.10938 A 14.90646 14.985372 0 0 0 1418.3262 288.21094 L 1420.082 281.23242 A 21.531579 21.645545 0 0 0 1410.3574 277.87695 z "
+       inkscape:radius="-1.7800632"
+       sodipodi:type="inkscape:offset"
+       transform="matrix(0.09454167,0,0,0.09567552,-131.04195,-26.527178)"
+       d="m 1411.3867,279.90625 -2.4316,5.32422 a 1.7802412,1.7802412 0 0 1 -1.4766,1.0332 c -1.0454,0.0839 -2.0803,0.29572 -3.0762,0.62695 a 1.7802412,1.7802412 0 0 1 -1.8066,-0.41601 l -4.1367,-4.04102 c -2.0341,1.21777 -3.8275,2.78444 -5.3086,4.64258 l 3.3769,4.79102 a 1.7802412,1.7802412 0 0 1 0.1465,1.80078 c -0.4386,0.90515 -0.7729,1.86192 -0.9961,2.84375 a 1.7802412,1.7802412 0 0 1 -1.25,1.31836 l -5.7129,1.625 c 0.012,2.37676 0.5376,4.72007 1.377,6.9414 l 5.7363,-0.5371 a 1.7802412,1.7802412 0 0 1 1.6543,0.79492 c 0.5695,0.86705 1.2411,1.66622 1.9961,2.375 a 1.7802412,1.7802412 0 0 1 0.5078,1.73242 l -1.4375,5.71094 c 2.0352,1.19507 4.2568,2.00835 6.5782,2.41406 l 2.3945,-5.23633 a 1.7802412,1.7802412 0 0 1 1.5351,-1.03711 c 1.1088,-0.0529 2.2094,-0.24888 3.2696,-0.58008 a 1.7802412,1.7802412 0 0 1 1.7754,0.42578 l 4.1699,4.07422 c 2.0299,-1.18458 3.826,-2.71613 5.3203,-4.53711 l -3.3281,-4.7207 a 1.7802412,1.7802412 0 0 1 -0.1289,-1.83594 c 0.531,-1.03672 0.9253,-2.1464 1.1679,-3.28711 a 1.7802412,1.7802412 0 0 1 1.2539,-1.34179 l 5.6348,-1.60352 c -0.034,-2.3541 -0.5552,-4.67207 -1.4004,-6.86719 l -5.7773,0.54102 a 1.7802412,1.7802412 0 0 1 -1.6485,-0.78516 c -0.6274,-0.94264 -1.3754,-1.80236 -2.2207,-2.55273 a 1.7802412,1.7802412 0 0 1 -0.5449,-1.76563 l 1.4063,-5.58984 c -2.0575,-1.15262 -4.2917,-1.92264 -6.6192,-2.28125 z" />
+    <ellipse
+       inkscape:export-ydpi="25"
+       inkscape:export-xdpi="25"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/setup.png"
+       ry="0.58563244"
+       rx="0.58557379"
+       cy="2.117718"
+       cx="2.115557"
+       id="ellipse5056"
+       style="fill:#f0f0f0;fill-opacity:1;stroke:#767676;stroke-width:0.3202;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/icons/svg/unlocked_16px.svg b/src/icons/svg/unlocked_16px.svg
new file mode 100644
index 000000000..a2f6195c2
--- /dev/null
+++ b/src/icons/svg/unlocked_16px.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="unlocked_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449576"
+     inkscape:cx="2.4131298"
+     inkscape:cy="7.8324467"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       y="1.9842902"
+       x="0.92595428"
+       height="1.8522555"
+       width="2.3814235"
+       id="rect1125"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <path
+       id="path1127"
+       d="M 1.3418642,0.48138927 C 0.91744749,0.88018547 0.89611914,1.5513586 1.2942097,1.9762681 L 1.487176,1.7954986 C 1.1866427,1.4747631 1.2024656,0.97520094 1.5228465,0.67415691 1.8434044,0.37294117 2.3434623,0.38840337 2.6448409,0.70881559 a 0.13221874,0.13221873 0 0 0 5.221e-4,5.2097e-4 0.13221874,0.13221873 0 0 0 5.998e-4,6.6981e-4 L 2.8389276,0.52923994 a 0.13221874,0.13221873 0 0 0 -5.221e-4,-5.2097e-4 0.13221874,0.13221873 0 0 0 -9.919e-4,-0.001061 c -2.24e-4,-2.9914e-4 -5.998e-4,-3.7254e-4 -8.074e-4,-6.6981e-4 A 0.13221874,0.13221873 0 0 0 2.8173387,0.51026606 C 2.4160809,0.10472713 1.759936,0.08856153 1.3418619,0.48140197 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       y="2.3270543"
+       x="-0.40660211"
+       height="0.26458371"
+       width="0.2645832"
+       id="rect1129"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(-43.130648)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       y="2.3270543"
+       x="1.445482"
+       height="0.26458371"
+       width="0.2645832"
+       id="rect1131"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(-43.130648)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="27.093332"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       y="4.4408921e-16"
+       x="4.4408921e-16"
+       height="4.2333336"
+       width="4.2333336"
+       id="rect1586"
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="1.9842902"
+       x="0.92595428"
+       height="1.8522555"
+       width="2.3814235"
+       id="rect1660"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:#282828;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <path
+       id="path1662"
+       d="M 1.3418642,0.48138927 C 0.91744749,0.88018547 0.89611914,1.5513586 1.2942097,1.9762681 L 1.487176,1.7954986 C 1.1866427,1.4747631 1.2024656,0.97520094 1.5228465,0.67415691 1.8434044,0.37294117 2.3434623,0.38840337 2.6448409,0.70881559 a 0.13221874,0.13221873 0 0 0 5.221e-4,5.2097e-4 0.13221874,0.13221873 0 0 0 5.998e-4,6.6981e-4 L 2.8389276,0.52923994 a 0.13221874,0.13221873 0 0 0 -5.221e-4,-5.2097e-4 0.13221874,0.13221873 0 0 0 -9.919e-4,-0.001061 c -2.24e-4,-2.9914e-4 -5.998e-4,-3.7254e-4 -8.074e-4,-6.6981e-4 A 0.13221874,0.13221873 0 0 0 2.8173387,0.51026606 C 2.4160809,0.10472713 1.759936,0.08856153 1.3418619,0.48140197 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       y="2.3270543"
+       x="-0.40660211"
+       height="0.26458371"
+       width="0.2645832"
+       id="rect1664"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(-43.130648)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <rect
+       y="2.3270543"
+       x="1.445482"
+       height="0.26458371"
+       width="0.2645832"
+       id="rect1666"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       transform="rotate(-43.130648)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2811607"
+       sodipodi:start="0"
+       sodipodi:ry="0.26458362"
+       sodipodi:rx="0.26458332"
+       sodipodi:cy="2.6463687"
+       sodipodi:cx="2.1166661"
+       sodipodi:type="arc"
+       id="path1672"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e9e9e9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332"
+       sodipodi:arc-type="arc"
+       d="M 2.3812494,2.6463687 A 0.26458332,0.26458362 0 0 1 2.1168,2.9109523 0.26458332,0.26458362 0 0 1 1.8520829,2.6466366 0.26458332,0.26458362 0 0 1 2.1162643,2.3817854 0.26458332,0.26458362 0 0 1 2.3812489,2.6458331" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1674"
+       d="M 2.1166662,2.6458314 1.8520834,3.4395819 h 0.5291664 z"
+       style="fill:#e9e9e9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0746714px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/unlocked_16.png"
+       inkscape:export-xdpi="27.093332"
+       inkscape:export-ydpi="27.093332" />
+  </g>
+</svg>
diff --git a/src/icons/svg/warn_16px.svg b/src/icons/svg/warn_16px.svg
new file mode 100644
index 000000000..846c46a50
--- /dev/null
+++ b/src/icons/svg/warn_16px.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="warn_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="12.224788"
+     inkscape:cx="8.1801007"
+     inkscape:cy="18.200724"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4777"
+       id="linearGradient4783"
+       x1="-287.00787"
+       y1="329.52753"
+       x2="-255.1181"
+       y2="347.24408"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0861278,0,0,0.08717298,25.61501,-26.896698)" />
+    <linearGradient
+       id="linearGradient4777">
+      <stop
+         style="stop-color:#ffd71a;stop-opacity:1;"
+         offset="0"
+         id="stop4779" />
+      <stop
+         id="stop4804"
+         offset="0.5"
+         style="stop-color:#fffc26;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fffcae;stop-opacity:1;"
+         offset="1"
+         id="stop4781" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="25.4"
+       inkscape:export-xdpi="25.4"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/warn_16.png"
+       y="-0.0022746047"
+       x="-8.8817842e-16"
+       height="4.2356081"
+       width="4.2333336"
+       id="rect4586-2"
+       style="fill:none;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:url(#linearGradient4783);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.26142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.18000646,3.6757376 C 0.04735663,3.4930017 0.22791481,3.19714 0.22791481,3.19714 L 1.7966503,0.32425412 c 0,0 0.1036998,-0.19578646 0.3137471,-0.19578646 0.2100466,0 0.3137463,0.19578646 0.3137463,0.19578646 L 3.9928792,3.19714 c 0,0 0.201237,0.3210671 0.055342,0.4976557 C 3.9023269,3.8713836 3.6791314,3.835558 3.6791314,3.835558 H 0.54166264 c 0,0 -0.22900788,0.022915 -0.36165618,-0.1598204 z"
+       id="path4775"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zcczcczccz"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/warn_16.png"
+       inkscape:export-xdpi="25.4"
+       inkscape:export-ydpi="25.4" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.261409;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4787"
+       cx="2.0708609"
+       cy="2.5498388"
+       rx="0.13626829"
+       ry="0.9422366"
+       transform="matrix(0.97952475,0.2013238,-0.45159661,0.89222223,0,0)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/warn_16.png"
+       inkscape:export-xdpi="25.4"
+       inkscape:export-ydpi="25.4" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.074691px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.8520825,1.321354 H 2.1323209 2.3812488 V 2.6449817 H 2.1166653 1.8520825 Z"
+       id="path4800"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/warn_16.png"
+       inkscape:export-xdpi="25.4"
+       inkscape:export-ydpi="25.4" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26142;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4802"
+       cx="2.1166649"
+       cy="3.174433"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/images/warn_16.png"
+       inkscape:export-xdpi="25.4"
+       inkscape:export-ydpi="25.4"
+       rx="0.26458332"
+       ry="0.26472545" />
+  </g>
+</svg>
diff --git a/src/lay/lay/LogViewerDialog.ui b/src/lay/lay/LogViewerDialog.ui
index 889342ade..d625b0d06 100644
--- a/src/lay/lay/LogViewerDialog.ui
+++ b/src/lay/lay/LogViewerDialog.ui
@@ -169,7 +169,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="layResources.qrc">:/warn_16.png</pixmap>
+            <pixmap resource="layResources.qrc">:/warn_16px.png</pixmap>
            </property>
           </widget>
          </item>
diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui
index 01c5917c0..3621b1fe6 100644
--- a/src/lay/lay/MacroEditorDialog.ui
+++ b/src/lay/lay/MacroEditorDialog.ui
@@ -492,7 +492,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="layResources.qrc">
-               <normaloff>:/breakpoint.png</normaloff>:/breakpoint.png</iconset>
+               <normaloff>:/breakpoint_16px.png</normaloff>:/breakpoint_16px.png</iconset>
              </property>
              <property name="shortcut">
               <string>F9</string>
@@ -515,7 +515,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="layResources.qrc">
-               <normaloff>:/clearbreakpoints.png</normaloff>:/clearbreakpoints.png</iconset>
+               <normaloff>:/clearbreakpoints_16px.png</normaloff>:/clearbreakpoints_16px.png</iconset>
              </property>
              <property name="shortcut">
               <string>Ctrl+Shift+F9</string>
@@ -628,7 +628,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="layResources.qrc">
-               <normaloff>:/properties.png</normaloff>:/properties.png</iconset>
+               <normaloff>:/properties_16px.png</normaloff>:/properties_16px.png</iconset>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
@@ -648,7 +648,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="layResources.qrc">
-               <normaloff>:/setup.png</normaloff>:/setup.png</iconset>
+               <normaloff>:/setup_16px.png</normaloff>:/setup_16px.png</iconset>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
@@ -821,7 +821,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="layResources.qrc">
-               <normaloff>:/help.png</normaloff>:/help.png</iconset>
+               <normaloff>:/help_16px.png</normaloff>:/help_16px.png</iconset>
              </property>
              <property name="shortcut">
               <string/>
diff --git a/src/lay/lay/SaltGrainPropertiesDialog.ui b/src/lay/lay/SaltGrainPropertiesDialog.ui
index 2ff5a7cb3..58d1e9411 100644
--- a/src/lay/lay/SaltGrainPropertiesDialog.ui
+++ b/src/lay/lay/SaltGrainPropertiesDialog.ui
@@ -244,7 +244,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/warn.png</normaloff>:/warn.png</iconset>
+             <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -345,7 +345,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/clear_edit.png</normaloff>:/clear_edit.png</iconset>
+             <normaloff>:/clear_edit_16px.png</normaloff>:/clear_edit_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -452,7 +452,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/clear_edit.png</normaloff>:/clear_edit.png</iconset>
+             <normaloff>:/clear_edit_16px.png</normaloff>:/clear_edit_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -517,7 +517,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/warn.png</normaloff>:/warn.png</iconset>
+             <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -618,7 +618,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/warn.png</normaloff>:/warn.png</iconset>
+             <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -732,7 +732,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/warn.png</normaloff>:/warn.png</iconset>
+             <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -824,7 +824,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/warn.png</normaloff>:/warn.png</iconset>
+             <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
diff --git a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui
index c5baf1b4c..4bdeab7d3 100644
--- a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui
+++ b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui
@@ -118,7 +118,7 @@
         </property>
         <property name="icon">
          <iconset resource="layResources.qrc">
-          <normaloff>:/warn.png</normaloff>:/warn.png</iconset>
+          <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
         </property>
         <property name="autoRaise">
          <bool>true</bool>
diff --git a/src/lay/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui
index 856193f5c..a5e57f393 100644
--- a/src/lay/lay/SaltManagerDialog.ui
+++ b/src/lay/lay/SaltManagerDialog.ui
@@ -238,7 +238,7 @@
                 </property>
                 <property name="icon">
                  <iconset resource="layResources.qrc">
-                  <normaloff>:/empty_16.png</normaloff>:/empty_16.png</iconset>
+                  <normaloff>:/empty_16px.png</normaloff>:/empty_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
                  <bool>true</bool>
@@ -537,7 +537,7 @@
                 </property>
                 <property name="icon">
                  <iconset resource="layResources.qrc">
-                  <normaloff>:/empty_16.png</normaloff>:/empty_16.png</iconset>
+                  <normaloff>:/empty_16px.png</normaloff>:/empty_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
                  <bool>true</bool>
diff --git a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui
index 1aec709fe..eb032592d 100644
--- a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui
+++ b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui
@@ -260,7 +260,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="layResources.qrc">:/warn_16.png</pixmap>
+                <pixmap resource="layResources.qrc">:/warn_16px.png</pixmap>
                </property>
               </widget>
              </item>
diff --git a/src/lay/lay/layLogViewerDialog.cc b/src/lay/lay/layLogViewerDialog.cc
index ef8d95319..dff6d7404 100644
--- a/src/lay/lay/layLogViewerDialog.cc
+++ b/src/lay/lay/layLogViewerDialog.cc
@@ -276,13 +276,13 @@ LogFile::data(const QModelIndex &index, int role) const
     if (index.row () < int (m_messages.size ()) && index.row () >= 0) {
       LogFileEntry::mode_type mode = m_messages [index.row ()].mode ();
       if (mode == LogFileEntry::Error) {
-        return QIcon (QString::fromUtf8 (":/error_16.png"));
+        return QIcon (QString::fromUtf8 (":/error_16px.png"));
       } else if (mode == LogFileEntry::Warning) {
-        return QIcon (QString::fromUtf8 (":/warn_16.png"));
+        return QIcon (QString::fromUtf8 (":/warn_16px.png"));
       } else if (mode == LogFileEntry::Info) {
-        return QIcon (QString::fromUtf8 (":/info_16.png"));
+        return QIcon (QString::fromUtf8 (":/info_16px.png"));
       } else {
-        return QIcon (QString::fromUtf8 (":/empty_16.png"));
+        return QIcon (QString::fromUtf8 (":/empty_16px.png"));
       }
     }
 
diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc
index d5929a4bb..42bfb4e60 100644
--- a/src/lay/lay/layMacroEditorPage.cc
+++ b/src/lay/lay/layMacroEditorPage.cc
@@ -321,8 +321,8 @@ const int sidePanelMargin = 4;
 
 MacroEditorSidePanel::MacroEditorSidePanel (QWidget *parent, MacroEditorTextWidget *text, MacroEditorExecutionModel *exec_model)
   : QWidget (parent), mp_text (text), mp_exec_model (exec_model), 
-    m_breakpoint_pixmap (QString::fromUtf8 (":/breakpointmark.png")),
-    m_breakpoint_disabled_pixmap (QString::fromUtf8 (":/breakpointmarkdisabled.png")),
+    m_breakpoint_pixmap (QString::fromUtf8 (":/breakpointmark_16px.png")),
+    m_breakpoint_disabled_pixmap (QString::fromUtf8 (":/breakpointmarkdisabled_16px.png")),
     m_exec_point_pixmap (QString::fromUtf8 (":/execmark.png")),
     m_debugging_on (true)
 {
diff --git a/src/lay/lay/layProgressWidget.cc b/src/lay/lay/layProgressWidget.cc
index 9dd1b75d8..276d3dd0b 100644
--- a/src/lay/lay/layProgressWidget.cc
+++ b/src/lay/lay/layProgressWidget.cc
@@ -172,7 +172,7 @@ ProgressWidget::ProgressWidget (ProgressReporter *pr, QWidget *parent, bool fw)
   attn_layout->setContentsMargins (0, 0, 0, 0);
 
   QLabel *attn_label1 = new QLabel (attn_frame);
-  attn_label1->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16.png")));
+  attn_label1->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px.png")));
   attn_layout->addWidget (attn_label1);
 
   QLabel *attn_label2 = new QLabel (attn_frame);
diff --git a/src/lay/lay/laySaltDownloadManager.cc b/src/lay/lay/laySaltDownloadManager.cc
index 8d9491926..4c0f84de9 100644
--- a/src/lay/lay/laySaltDownloadManager.cc
+++ b/src/lay/lay/laySaltDownloadManager.cc
@@ -98,7 +98,7 @@ ConfirmationDialog::mark_fetching (const std::string &name)
 void
 ConfirmationDialog::mark_error (const std::string &name)
 {
-  set_icon_for_name (name, QIcon (QString::fromUtf8 (":/error_16.png")));
+  set_icon_for_name (name, QIcon (QString::fromUtf8 (":/error_16px.png")));
 
   std::map<std::string, QTreeWidgetItem *>::const_iterator i = m_items_by_name.find (name);
   if (i != m_items_by_name.end ()) {
diff --git a/src/lay/lay/laySaltManagerDialog.cc b/src/lay/lay/laySaltManagerDialog.cc
index e53ec4cef..85bbf84d6 100644
--- a/src/lay/lay/laySaltManagerDialog.cc
+++ b/src/lay/lay/laySaltManagerDialog.cc
@@ -999,7 +999,7 @@ SaltManagerDialog::update_models ()
   }
 
   if (has_warning) {
-    mode_tab->setTabIcon (1, QIcon (":/warn_16.png"));
+    mode_tab->setTabIcon (1, QIcon (":/warn_16px.png"));
   } else {
     mode_tab->setTabIcon (1, QIcon ());
   }
diff --git a/src/lay/lay/laySaltModel.cc b/src/lay/lay/laySaltModel.cc
index 3f2209158..e72ccae2b 100644
--- a/src/lay/lay/laySaltModel.cc
+++ b/src/lay/lay/laySaltModel.cc
@@ -163,15 +163,15 @@ SaltModel::data (const QModelIndex &index, int role) const
     if (m != m_messages.end ()) {
       if (m->second.first == Warning) {
         QPainter painter (&img);
-        QImage warn (":/warn_16.png");
+        QImage warn (":/warn_16px.png");
         painter.drawImage (0, 0, warn);
       } else if (m->second.first == Error) {
         QPainter painter (&img);
-        QImage warn (":/error_16.png");
+        QImage warn (":/error_16px.png");
         painter.drawImage (0, 0, warn);
       } else if (m->second.first == Info) {
         QPainter painter (&img);
-        QImage warn (":/info_16.png");
+        QImage warn (":/info_16px.png");
         painter.drawImage (0, 0, warn);
       }
     }
diff --git a/src/layui/layui/BrowserPanel.ui b/src/layui/layui/BrowserPanel.ui
index eb985f044..74e1d2aeb 100644
--- a/src/layui/layui/BrowserPanel.ui
+++ b/src/layui/layui/BrowserPanel.ui
@@ -241,7 +241,7 @@
                </property>
                <property name="icon">
                 <iconset resource="../../icons/icons.qrc">
-                 <normaloff>:/clear_edit.png</normaloff>:/clear_edit.png</iconset>
+                 <normaloff>:/clear_edit_16px.png</normaloff>:/clear_edit_16px.png</iconset>
                </property>
                <property name="autoRaise">
                 <bool>true</bool>
@@ -314,7 +314,7 @@
      </property>
      <property name="icon">
       <iconset resource="../../icons/icons.qrc">
-       <normaloff>:/home.png</normaloff>:/home.png</iconset>
+       <normaloff>:/home_24px.png</normaloff>:/home_24px.png</iconset>
      </property>
      <property name="iconSize">
       <size>
@@ -353,7 +353,7 @@
      </property>
      <property name="icon">
       <iconset resource="../../icons/icons.qrc">
-       <normaloff>:/prev_topic.png</normaloff>:/prev_topic.png</iconset>
+       <normaloff>:/prev_topic_24px.png</normaloff>:/prev_topic_24px.png</iconset>
      </property>
      <property name="iconSize">
       <size>
@@ -406,7 +406,7 @@
      </property>
      <property name="icon">
       <iconset resource="../../icons/icons.qrc">
-       <normaloff>:/next_topic.png</normaloff>:/next_topic.png</iconset>
+       <normaloff>:/next_topic_24px.png</normaloff>:/next_topic_24px.png</iconset>
      </property>
      <property name="iconSize">
       <size>
@@ -462,7 +462,7 @@
      </property>
      <property name="icon">
       <iconset resource="../../icons/icons.qrc">
-       <normaloff>:/bookmark.png</normaloff>:/bookmark.png</iconset>
+       <normaloff>:/bookmark_24px.png</normaloff>:/bookmark_24px.png</iconset>
      </property>
      <property name="iconSize">
       <size>
diff --git a/src/layui/layui/NetlistBrowserPage.ui b/src/layui/layui/NetlistBrowserPage.ui
index 74697088b..f43cde269 100644
--- a/src/layui/layui/NetlistBrowserPage.ui
+++ b/src/layui/layui/NetlistBrowserPage.ui
@@ -121,7 +121,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/info_16.png</normaloff>:/info_16.png</iconset>
+             <normaloff>:/info_16px.png</normaloff>:/info_16px.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
diff --git a/src/layui/layui/layBrowserPanel.cc b/src/layui/layui/layBrowserPanel.cc
index 1f46f5858..b26bfba4b 100644
--- a/src/layui/layui/layBrowserPanel.cc
+++ b/src/layui/layui/layBrowserPanel.cc
@@ -332,7 +332,7 @@ BrowserPanel::refresh_bookmark_list ()
     QTreeWidgetItem *item = new QTreeWidgetItem (mp_ui->browser_bookmark_view);
     item->setData (0, Qt::DisplayRole, tl::to_qstring (i->title));
     item->setData (0, Qt::ToolTipRole, tl::to_qstring (i->title));
-    item->setData (0, Qt::DecorationRole, QIcon (":/bookmark_16.png"));
+    item->setData (0, Qt::DecorationRole, QIcon (":/bookmark_16px.png"));
   }
 
   update_navigation_panel ();
diff --git a/src/layui/layui/layNetlistBrowserModel.cc b/src/layui/layui/layNetlistBrowserModel.cc
index 82ffa4f81..0151762ef 100644
--- a/src/layui/layui/layNetlistBrowserModel.cc
+++ b/src/layui/layui/layNetlistBrowserModel.cc
@@ -2505,9 +2505,9 @@ NetlistBrowserModel::columnCount (const QModelIndex & /*parent*/) const
 QIcon icon_for_status (db::NetlistCrossReference::Status status)
 {
   if (status == db::NetlistCrossReference::NoMatch || status == db::NetlistCrossReference::Mismatch) {
-    return QIcon (":/error2_16.png");
+    return QIcon (":/error2_16px.png");
   } else if (status == db::NetlistCrossReference::MatchWithWarning || status == db::NetlistCrossReference::Skipped) {
-    return QIcon (":/warn_16.png");
+    return QIcon (":/warn_16px.png");
   } else {
     return QIcon ();
   }
@@ -2921,7 +2921,7 @@ NetlistBrowserModel::headerData (int section, Qt::Orientation /*orientation*/, i
     }
 
   } else if (role == Qt::DecorationRole && section == m_status_column) {
-    return QIcon (":/info_16.png");
+    return QIcon (":/info_16px.png");
   }
 
   return QVariant ();
diff --git a/src/layui/layui/layNetlistBrowserTreeModel.cc b/src/layui/layui/layNetlistBrowserTreeModel.cc
index 4cf123eb2..f70084468 100644
--- a/src/layui/layui/layNetlistBrowserTreeModel.cc
+++ b/src/layui/layui/layNetlistBrowserTreeModel.cc
@@ -62,9 +62,9 @@ static QIcon icon_for_circuit ()
 static QIcon icon_for_status (db::NetlistCrossReference::Status status)
 {
   if (status == db::NetlistCrossReference::NoMatch || status == db::NetlistCrossReference::Mismatch) {
-    return QIcon (":/error2_16.png");
+    return QIcon (":/error2_16px.png");
   } else if (status == db::NetlistCrossReference::MatchWithWarning || status == db::NetlistCrossReference::Skipped) {
-    return QIcon (":/warn_16.png");
+    return QIcon (":/warn_16px.png");
   } else {
     return QIcon ();
   }
@@ -392,7 +392,7 @@ NetlistBrowserTreeModel::headerData (int section, Qt::Orientation /*orientation*
       return tr ("Circuits");
     }
   } else if (role == Qt::DecorationRole && section == m_status_column) {
-    return QIcon (":/info_16.png");
+    return QIcon (":/info_16px.png");
   }
   return QVariant ();
 }
diff --git a/src/layui/layui/layNetlistLogModel.cc b/src/layui/layui/layNetlistLogModel.cc
index f65e9c84d..bb777690a 100644
--- a/src/layui/layui/layNetlistLogModel.cc
+++ b/src/layui/layui/layNetlistLogModel.cc
@@ -165,11 +165,11 @@ NetlistLogModel::data (const QModelIndex &index, int role) const
     if (! le) {
       //  ignore
     } else if (le->severity == db::NetlistCrossReference::Error) {
-      return QIcon (QString::fromUtf8 (":/error_16.png"));
+      return QIcon (QString::fromUtf8 (":/error_16px.png"));
     } else if (le->severity == db::NetlistCrossReference::Warning) {
-      return QIcon (QString::fromUtf8 (":/warn_16.png"));
+      return QIcon (QString::fromUtf8 (":/warn_16px.png"));
     } else if (le->severity == db::NetlistCrossReference::Info) {
-      return QIcon (QString::fromUtf8 (":/info_16.png"));
+      return QIcon (QString::fromUtf8 (":/info_16px.png"));
     }
 
   } else if (role == Qt::DisplayRole) {
diff --git a/src/layui/layui/layWidgets.cc b/src/layui/layui/layWidgets.cc
index 1878937b1..f4d64498e 100644
--- a/src/layui/layui/layWidgets.cc
+++ b/src/layui/layui/layWidgets.cc
@@ -1006,7 +1006,7 @@ DecoratedLineEdit::DecoratedLineEdit (QWidget *parent)
   mp_clear_label = new QLabel (this);
   mp_clear_label->hide ();
   mp_clear_label->setCursor (Qt::ArrowCursor);
-  mp_clear_label->setPixmap (QString::fromUtf8 (":/clear_edit.png"));
+  mp_clear_label->setPixmap (QString::fromUtf8 (":/clear_edit_16px.png"));
 
   QMargins margins = textMargins ();
   m_default_left_margin = margins.left ();
diff --git a/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui b/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui
index 33cae9bb9..fd744207f 100644
--- a/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui
+++ b/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui
@@ -284,7 +284,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap resource="../../../../lay/lay/layResources.qrc">:/warn.png</pixmap>
+               <pixmap resource="../../../../lay/lay/layResources.qrc">:/warn_16px.png</pixmap>
               </property>
              </widget>
             </item>
@@ -379,7 +379,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap resource="../../../../lay/lay/layResources.qrc">:/warn.png</pixmap>
+               <pixmap resource="../../../../lay/lay/layResources.qrc">:/warn_16px.png</pixmap>
               </property>
              </widget>
             </item>