diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts
index 95fad062..a4e9d33e 100644
--- a/flatlaf-demo/build.gradle.kts
+++ b/flatlaf-demo/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
 	implementation( project( ":flatlaf-core" ) )
 	implementation( "com.miglayout:miglayout-swing:5.2" )
 	implementation( "com.jgoodies:jgoodies-forms:1.9.0" )
+	implementation( "guru.nidi.com.kitfox:svgSalamander:1.1.2" )
 }
 
 java {
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
index dff0a182..25f2b9c5 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
@@ -17,6 +17,7 @@
 package com.formdev.flatlaf.demo;
 
 import java.awt.*;
+import java.awt.event.*;
 import javax.swing.*;
 import net.miginfocom.swing.*;
 
@@ -36,12 +37,48 @@ class DemoFrame
 			tabbedPane.setSelectedIndex( tabIndex );
 	}
 
+	private void exitActionPerformed() {
+		dispose();
+	}
+
+	private void aboutActionPerformed() {
+		JOptionPane.showMessageDialog( this, "FlatLaf Demo", "About", JOptionPane.PLAIN_MESSAGE );
+	}
+
 	private void selectedTabChanged() {
 		FlatLafDemo.prefs.putInt( FlatLafDemo.KEY_TAB, tabbedPane.getSelectedIndex() );
 	}
 
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+		JMenuBar menuBar1 = new JMenuBar();
+		JMenu fileMenu = new JMenu();
+		JMenuItem newMenuItem = new JMenuItem();
+		JMenuItem openMenuItem = new JMenuItem();
+		JMenuItem closeMenuItem = new JMenuItem();
+		JMenuItem exitMenuItem = new JMenuItem();
+		JMenu editMenu = new JMenu();
+		JMenuItem undoMenuItem = new JMenuItem();
+		JMenuItem redoMenuItem = new JMenuItem();
+		JMenuItem cutMenuItem = new JMenuItem();
+		JMenuItem copyMenuItem = new JMenuItem();
+		JMenuItem pasteMenuItem = new JMenuItem();
+		JMenuItem deleteMenuItem = new JMenuItem();
+		JMenu viewMenu = new JMenu();
+		JCheckBoxMenuItem checkBoxMenuItem1 = new JCheckBoxMenuItem();
+		JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
+		JRadioButtonMenuItem radioButtonMenuItem2 = new JRadioButtonMenuItem();
+		JRadioButtonMenuItem radioButtonMenuItem3 = new JRadioButtonMenuItem();
+		JMenu helpMenu = new JMenu();
+		JMenuItem aboutMenuItem = new JMenuItem();
+		JToolBar toolBar1 = new JToolBar();
+		JButton backButton = new JButton();
+		JButton forwardButton = new JButton();
+		JButton cutButton = new JButton();
+		JButton copyButton = new JButton();
+		JButton pasteButton = new JButton();
+		JButton refreshButton = new JButton();
+		JToggleButton showToggleButton = new JToggleButton();
 		JPanel contentPanel = new JPanel();
 		tabbedPane = new JTabbedPane();
 		BasicComponentsPanel basicComponentsPanel = new BasicComponentsPanel();
@@ -57,6 +94,132 @@ class DemoFrame
 		Container contentPane = getContentPane();
 		contentPane.setLayout(new BorderLayout());
 
+		//======== menuBar1 ========
+		{
+
+			//======== fileMenu ========
+			{
+				fileMenu.setText("File");
+
+				//---- newMenuItem ----
+				newMenuItem.setText("New");
+				newMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				fileMenu.add(newMenuItem);
+
+				//---- openMenuItem ----
+				openMenuItem.setText("Open");
+				openMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				fileMenu.add(openMenuItem);
+				fileMenu.addSeparator();
+
+				//---- closeMenuItem ----
+				closeMenuItem.setText("Close");
+				closeMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				fileMenu.add(closeMenuItem);
+				fileMenu.addSeparator();
+
+				//---- exitMenuItem ----
+				exitMenuItem.setText("Exit");
+				exitMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				exitMenuItem.addActionListener(e -> exitActionPerformed());
+				fileMenu.add(exitMenuItem);
+			}
+			menuBar1.add(fileMenu);
+
+			//======== editMenu ========
+			{
+				editMenu.setText("Edit");
+
+				//---- undoMenuItem ----
+				undoMenuItem.setText("Undo");
+				undoMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				editMenu.add(undoMenuItem);
+
+				//---- redoMenuItem ----
+				redoMenuItem.setText("Redo");
+				redoMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				editMenu.add(redoMenuItem);
+				editMenu.addSeparator();
+
+				//---- cutMenuItem ----
+				cutMenuItem.setText("Cut");
+				cutMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				editMenu.add(cutMenuItem);
+
+				//---- copyMenuItem ----
+				copyMenuItem.setText("Copy");
+				copyMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				editMenu.add(copyMenuItem);
+
+				//---- pasteMenuItem ----
+				pasteMenuItem.setText("Paste");
+				pasteMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
+				editMenu.add(pasteMenuItem);
+				editMenu.addSeparator();
+
+				//---- deleteMenuItem ----
+				deleteMenuItem.setText("Delete");
+				deleteMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
+				editMenu.add(deleteMenuItem);
+			}
+			menuBar1.add(editMenu);
+
+			//======== viewMenu ========
+			{
+				viewMenu.setText("View");
+
+				//---- checkBoxMenuItem1 ----
+				checkBoxMenuItem1.setText("Show Toolbar");
+				checkBoxMenuItem1.setSelected(true);
+				viewMenu.add(checkBoxMenuItem1);
+				viewMenu.addSeparator();
+
+				//---- radioButtonMenuItem1 ----
+				radioButtonMenuItem1.setText("Details");
+				radioButtonMenuItem1.setSelected(true);
+				viewMenu.add(radioButtonMenuItem1);
+
+				//---- radioButtonMenuItem2 ----
+				radioButtonMenuItem2.setText("Small Icons");
+				viewMenu.add(radioButtonMenuItem2);
+
+				//---- radioButtonMenuItem3 ----
+				radioButtonMenuItem3.setText("Large Icons");
+				viewMenu.add(radioButtonMenuItem3);
+			}
+			menuBar1.add(viewMenu);
+
+			//======== helpMenu ========
+			{
+				helpMenu.setText("Help");
+
+				//---- aboutMenuItem ----
+				aboutMenuItem.setText("About");
+				aboutMenuItem.addActionListener(e -> aboutActionPerformed());
+				helpMenu.add(aboutMenuItem);
+			}
+			menuBar1.add(helpMenu);
+		}
+		setJMenuBar(menuBar1);
+
+		//======== toolBar1 ========
+		{
+			toolBar1.add(backButton);
+			toolBar1.add(forwardButton);
+			toolBar1.addSeparator();
+			toolBar1.add(cutButton);
+			toolBar1.add(copyButton);
+			toolBar1.add(pasteButton);
+			toolBar1.addSeparator();
+			toolBar1.add(refreshButton);
+			toolBar1.addSeparator();
+
+			//---- showToggleButton ----
+			showToggleButton.setSelected(true);
+			toolBar1.add(showToggleButton);
+		}
+		contentPane.add(toolBar1, BorderLayout.NORTH);
+
 		//======== contentPanel ========
 		{
 			contentPanel.setLayout(new MigLayout(
@@ -80,7 +243,28 @@ class DemoFrame
 			contentPanel.add(controlBar, "cell 0 1");
 		}
 		contentPane.add(contentPanel, BorderLayout.CENTER);
+
+		//---- buttonGroup1 ----
+		ButtonGroup buttonGroup1 = new ButtonGroup();
+		buttonGroup1.add(radioButtonMenuItem1);
+		buttonGroup1.add(radioButtonMenuItem2);
+		buttonGroup1.add(radioButtonMenuItem3);
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
+
+		undoMenuItem.setIcon( new ScaledSVGIcon( "icons/undo.svg" ) );
+		redoMenuItem.setIcon( new ScaledSVGIcon( "icons/redo.svg" ) );
+
+		cutMenuItem.setIcon( new ScaledSVGIcon( "icons/menu-cut.svg" ) );
+		copyMenuItem.setIcon( new ScaledSVGIcon( "icons/copy.svg" ) );
+		pasteMenuItem.setIcon( new ScaledSVGIcon( "icons/menu-paste.svg" ) );
+
+		backButton.setIcon( new ScaledSVGIcon( "icons/back.svg" ) );
+		forwardButton.setIcon( new ScaledSVGIcon( "icons/forward.svg" ) );
+		cutButton.setIcon( new ScaledSVGIcon( "icons/menu-cut.svg" ) );
+		copyButton.setIcon( new ScaledSVGIcon( "icons/copy.svg" ) );
+		pasteButton.setIcon( new ScaledSVGIcon( "icons/menu-paste.svg" ) );
+		refreshButton.setIcon( new ScaledSVGIcon( "icons/refresh.svg" ) );
+		showToggleButton.setIcon( new ScaledSVGIcon( "icons/show.svg" ) );
 	}
 
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
index 698ff58f..a13b97ed 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
@@ -12,6 +12,42 @@ new FormModel {
 			"defaultCloseOperation": 2
 			"$locationPolicy": 2
 			"$sizePolicy": 2
+			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+				name: "toolBar1"
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "backButton"
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "forwardButton"
+				} )
+				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
+					name: "separator5"
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "cutButton"
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "copyButton"
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "pasteButton"
+				} )
+				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
+					name: "separator6"
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "refreshButton"
+				} )
+				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
+					name: "separator7"
+				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "showToggleButton"
+					"selected": true
+				} )
+			}, new FormLayoutConstraints( class java.lang.String ) {
+				"value": "North"
+			} )
 			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 				"$layoutConstraints": "insets dialog,hidemode 3"
 				"$columnConstraints": "[grow,fill]"
@@ -63,9 +99,125 @@ new FormModel {
 			}, new FormLayoutConstraints( class java.lang.String ) {
 				"value": "Center"
 			} )
+			menuBar: new FormContainer( "javax.swing.JMenuBar", new FormLayoutManager( class javax.swing.JMenuBar ) ) {
+				name: "menuBar1"
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "fileMenu"
+					"text": "File"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "newMenuItem"
+						"text": "New"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 78, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "openMenuItem"
+						"text": "Open"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 79, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
+						name: "separator2"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "closeMenuItem"
+						"text": "Close"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 87, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
+						name: "separator1"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "exitMenuItem"
+						"text": "Exit"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 81, 4226, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "exitActionPerformed", false ) )
+					} )
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "editMenu"
+					"text": "Edit"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "undoMenuItem"
+						"text": "Undo"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 90, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "redoMenuItem"
+						"text": "Redo"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 89, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
+						name: "separator4"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "cutMenuItem"
+						"text": "Cut"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 88, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "copyMenuItem"
+						"text": "Copy"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 67, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "pasteMenuItem"
+						"text": "Paste"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 86, 4226, false )
+					} )
+					add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
+						name: "separator3"
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "deleteMenuItem"
+						"text": "Delete"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 127, 0, false )
+					} )
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "viewMenu"
+					"text": "View"
+					add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
+						name: "checkBoxMenuItem1"
+						"text": "Show Toolbar"
+						"selected": true
+					} )
+					add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
+						name: "separator8"
+					} )
+					add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
+						name: "radioButtonMenuItem1"
+						"text": "Details"
+						"selected": true
+						"$buttonGroup": new FormReference( "buttonGroup1" )
+					} )
+					add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
+						name: "radioButtonMenuItem2"
+						"text": "Small Icons"
+						"$buttonGroup": new FormReference( "buttonGroup1" )
+					} )
+					add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
+						name: "radioButtonMenuItem3"
+						"text": "Large Icons"
+						"$buttonGroup": new FormReference( "buttonGroup1" )
+					} )
+				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "helpMenu"
+					"text": "Help"
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "aboutMenuItem"
+						"text": "About"
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "aboutActionPerformed", false ) )
+					} )
+				} )
+			}
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
 			"size": new java.awt.Dimension( 800, 710 )
 		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "buttonGroup1"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 720 )
+		} )
 	}
 }
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java
new file mode 100644
index 00000000..aef13317
--- /dev/null
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.demo;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.net.URISyntaxException;
+import javax.swing.ImageIcon;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.UIScale;
+import com.kitfox.svg.app.beans.SVGIcon;
+
+/**
+ * @author Karl Tauber
+ */
+public class ScaledSVGIcon
+	extends ImageIcon
+{
+	private final SVGIcon svgIcon;
+
+	public ScaledSVGIcon( String name ) {
+		svgIcon = new SVGIcon();
+		svgIcon.setAntiAlias( true );
+
+		try {
+			svgIcon.setSvgURI( getClass().getResource( name ).toURI() );
+		} catch( URISyntaxException ex ) {
+			ex.printStackTrace();
+		}
+	}
+
+	@Override
+	public int getIconWidth() {
+		return UIScale.scale( svgIcon.getIconWidth() );
+	}
+
+	@Override
+	public int getIconHeight() {
+		return UIScale.scale( svgIcon.getIconHeight() );
+	}
+
+	@Override
+	public void paintIcon( Component c, Graphics g, int x, int y ) {
+		Graphics2D g2 = (Graphics2D) g.create();
+		try {
+			FlatUIUtils.setRenderingHints( g2 );
+
+			g2.translate( x, y );
+			UIScale.scaleGraphics( g2 );
+
+			svgIcon.paintIcon( c, g2, 0, 0 );
+		} finally {
+			g2.dispose();
+		}
+	}
+
+	@Override
+	public Image getImage() {
+		BufferedImage image = new BufferedImage( getIconWidth(), getIconHeight(), BufferedImage.TYPE_INT_ARGB );
+		Graphics2D g = image.createGraphics();
+		try {
+			paintIcon( null, g, 0, 0 );
+		} finally {
+			g.dispose();
+		}
+		return image;
+	}
+}
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/LICENSE.txt b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/LICENSE.txt
new file mode 100644
index 00000000..186cd751
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/LICENSE.txt
@@ -0,0 +1,3 @@
+The icons in this folder are from IntelliJ IDEA Community Edition,
+which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
+See: https://github.com/JetBrains/intellij-community/
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/back.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/back.svg
new file mode 100644
index 00000000..c5b84d14
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/back.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#6E6E6E" fill-rule="evenodd" transform="translate(1 3)">
+    <rect width="12" height="2" x="1" y="4"/>
+    <g transform="translate(0 .02)">
+      <rect width="7" height="1.8" x="-.389" y="2.24" transform="rotate(-45 3.111 3.14)"/>
+      <rect width="1.8" height="7" x="2.211" y="3.317" transform="rotate(-45 3.111 6.817)"/>
+    </g>
+  </g>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/copy.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/copy.svg
new file mode 100644
index 00000000..cfbf4d6d
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/copy.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M11,3 L4,3 L4,11 L2,11 L2,1 L11,1 L11,3 Z"/>
+    <path fill="#6E6E6E" d="M5,4 L14,4 L14,14 L5,14 L5,4 Z M7,6 L7,7 L12,7 L12,6 L7,6 Z M7,10 L7,11 L12,11 L12,10 L7,10 Z M7,8 L7,9 L12,9 L12,8 L7,8 Z"/>
+  </g>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/forward.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/forward.svg
new file mode 100644
index 00000000..0ce7c70f
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/forward.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="11" height="2" x="2" y="7" fill="#6E6E6E" transform="matrix(-1 0 0 1 15 0)"/>
+    <g fill="#6E6E6E" transform="matrix(-1 0 0 1 15 3.02)">
+      <rect width="7" height="1.8" x="-.389" y="2.24" transform="rotate(-45 3.111 3.14)"/>
+      <rect width="1.8" height="7" x="2.211" y="3.317" transform="rotate(-45 3.111 6.817)"/>
+    </g>
+  </g>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/menu-cut.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/menu-cut.svg
new file mode 100644
index 00000000..de353764
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/menu-cut.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" d="M6.53206047,5.10906 C6.68535547,4.77581 6.77200047,4.40923501 6.77200047,4.01600001 C6.77200047,2.54303502 5.57896548,1.35000002 4.10600049,1.35000002 C2.63303549,1.35000002 1.4400005,2.54303502 1.4400005,4.01600001 C1.4400005,5.488965 2.63303549,6.68199999 4.10600049,6.68199999 C4.49923548,6.68199999 4.86581048,6.59535499 5.19906048,6.44205999 L6.77200047,8.01499999 L5.19906048,9.58793998 C4.86581048,9.43464498 4.49923548,9.34799998 4.10600049,9.34799998 C2.63303549,9.34799998 1.4400005,10.541035 1.4400005,12.014 C1.4400005,13.486965 2.63303549,14.6799999 4.10600049,14.6799999 C5.57896548,14.6799999 6.77200047,13.486965 6.77200047,12.014 C6.77200047,11.620765 6.68535547,11.25419 6.53206047,10.92094 L8.10500046,9.34799998 L12.7705004,14 L14.7700004,14 L14.7700004,13.347 L6.53206047,5.10906 Z M4.1053342,5.33702364 C3.37236745,5.33702364 2.77266738,4.74383861 2.77266738,4.00402356 C2.77266738,3.26420851 3.37236745,2.67102348 4.1053342,2.67102348 C4.83830096,2.67102348 5.43800103,3.26420851 5.43800103,4.00402356 C5.43800103,4.74383861 4.83830096,5.33702364 4.1053342,5.33702364 Z M4.1053342,13.3350241 C3.37236745,13.3350241 2.77266738,12.7418391 2.77266738,12.0020241 C2.77266738,11.262209 3.37236745,10.669024 4.1053342,10.669024 C4.83830096,10.669024 5.43800103,11.262209 5.43800103,12.0020241 C5.43800103,12.7418391 4.83830096,13.3350241 4.1053342,13.3350241 Z M8.10333468,8.33627383 C7.91676132,8.33627383 7.77016797,8.18964382 7.77016797,8.00302381 C7.77016797,7.8164038 7.91676132,7.66977379 8.10333468,7.66977379 C8.28990803,7.66977379 8.43650138,7.8164038 8.43650138,8.00302381 C8.43650138,8.18964382 8.28990803,8.33627383 8.10333468,8.33627383 Z M12.7710002,2.00452344 L8.77299971,6.00352368 L10.1056665,7.33652377 L14.7700004,2.67102348 L14.7700004,2.00452344 L12.7710002,2.00452344 Z"/>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/menu-paste.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/menu-paste.svg
new file mode 100644
index 00000000..1debae89
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/menu-paste.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#737373" fill-rule="evenodd" d="M3,1 L3,0 L7,0 L7,1 L10,1 L10,13 L0,13 L0,1 L3,1 Z M4,1 L4,2 L6,2 L6,1 L4,1 Z M2,4 L2,11 L8,11 L8,4 L2,4 Z" transform="translate(3 1)"/>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/redo.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/redo.svg
new file mode 100644
index 00000000..98f4a4cb
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/redo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" d="M8.35170965,4.66666667 C6.5846115,4.66666667 4.98422073,5.32666667 3.75058618,6.4 L1.35000002,4 L1.35000002,10 L7.35146542,10 L4.93754267,7.58666667 C5.86443566,6.81333333 7.04472385,6.33333333 8.35170965,6.33333333 C10.712286,6.33333333 12.7194428,7.87333333 13.4196138,10 L14.9999996,9.48 C14.0731067,6.68666667 11.4524668,4.66666667 8.35170965,4.66666667 Z" transform="matrix(-1 0 0 1 16.35 0)"/>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/refresh.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/refresh.svg
new file mode 100644
index 00000000..74318a20
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/refresh.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" fill-rule="evenodd" d="M12.5747152,11.8852806 C11.4741474,13.1817355 9.83247882,14.0044386 7.99865879,14.0044386 C5.03907292,14.0044386 2.57997332,11.8615894 2.08820756,9.0427473 L3.94774327,9.10768372 C4.43372186,10.8898575 6.06393114,12.2000519 8.00015362,12.2000519 C9.30149237,12.2000519 10.4645985,11.6082097 11.2349873,10.6790094 L9.05000019,8.71167959 L14.0431479,8.44999981 L14.3048222,13.4430431 L12.5747152,11.8852806 Z M3.42785637,4.11741586 C4.52839138,2.82452748 6.16775464,2.00443857 7.99865879,2.00443857 C10.918604,2.00443857 13.3513802,4.09026967 13.8882946,6.8532307 L12.0226389,6.78808057 C11.5024872,5.05935553 9.89838095,3.8000774 8.00015362,3.8000774 C6.69867367,3.8000774 5.53545628,4.39204806 4.76506921,5.32142241 L6.95482203,7.29304326 L1.96167436,7.55472304 L1.70000005,2.56167973 L3.42785637,4.11741586 Z" transform="rotate(3 8.002 8.004)"/>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/show.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/show.svg
new file mode 100644
index 00000000..370c995f
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/show.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" d="M8,3 C4.81818182,3 2.10090909,5.07333333 1,8 C2.10090909,10.9266667 4.81818182,13 8,13 C11.1818182,13 13.8990909,10.9266667 15,8 C13.8990909,5.07333333 11.1818182,3 8,3 Z M8,11.5 C6.068,11.5 4.5,9.932 4.5,8 C4.5,6.068 6.068,4.5 8,4.5 C9.932,4.5 11.5,6.068 11.5,8 C11.5,9.932 9.932,11.5 8,11.5 Z M8,6 C6.89333333,6 6,6.89333333 6,8 C6,9.10666667 6.89333333,10 8,10 C9.10666667,10 10,9.10666667 10,8 C10,6.89333333 9.10666667,6 8,6 Z"/>
+</svg>
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/undo.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/undo.svg
new file mode 100644
index 00000000..81bea6ba
--- /dev/null
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/undo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" d="M8.00170962,4.66666667 C6.23461148,4.66666667 4.63422071,5.32666667 3.40058616,6.4 L1,4 L1,10 L7.00146539,10 L4.58754265,7.58666667 C5.51443563,6.81333333 6.69472383,6.33333333 8.00170962,6.33333333 C10.362286,6.33333333 12.3694428,7.87333333 13.0696137,10 L14.6499996,9.48 C13.7231066,6.68666667 11.1024667,4.66666667 8.00170962,4.66666667 Z"/>
+</svg>