diff --git a/themes/native/Resources/composed/button.png b/themes/native/Resources/composed/button.png
index c482904..bc7e9c8 100644
Binary files a/themes/native/Resources/composed/button.png and b/themes/native/Resources/composed/button.png differ
diff --git a/themes/native/Resources/composed/button_active.png b/themes/native/Resources/composed/button_active.png
index 8d721db..a36fc3a 100644
Binary files a/themes/native/Resources/composed/button_active.png and b/themes/native/Resources/composed/button_active.png differ
diff --git a/themes/native/Resources/composed/button_press.png b/themes/native/Resources/composed/button_press.png
index ca37f94..acd0e0a 100644
Binary files a/themes/native/Resources/composed/button_press.png and b/themes/native/Resources/composed/button_press.png differ
diff --git a/themes/native/Resources/composed/button_toolbar_hover.png b/themes/native/Resources/composed/button_toolbar_hover.png
index 39fb5ae..7d8fdeb 100644
Binary files a/themes/native/Resources/composed/button_toolbar_hover.png and b/themes/native/Resources/composed/button_toolbar_hover.png differ
diff --git a/themes/native/Resources/composed/button_toolbar_press.png b/themes/native/Resources/composed/button_toolbar_press.png
index 89f1838..0154260 100644
Binary files a/themes/native/Resources/composed/button_toolbar_press.png and b/themes/native/Resources/composed/button_toolbar_press.png differ
diff --git a/themes/native/Resources/composed/gtk3_combobox_button.png b/themes/native/Resources/composed/gtk3_combobox_button.png
new file mode 100644
index 0000000..818f24d
Binary files /dev/null and b/themes/native/Resources/composed/gtk3_combobox_button.png differ
diff --git a/themes/native/Resources/composed/gtk3_combobox_button_inactive.png b/themes/native/Resources/composed/gtk3_combobox_button_inactive.png
new file mode 100644
index 0000000..6e8708a
Binary files /dev/null and b/themes/native/Resources/composed/gtk3_combobox_button_inactive.png differ
diff --git a/themes/native/Resources/composed/gtk3_combobox_button_press.png b/themes/native/Resources/composed/gtk3_combobox_button_press.png
new file mode 100644
index 0000000..62dd10f
Binary files /dev/null and b/themes/native/Resources/composed/gtk3_combobox_button_press.png differ
diff --git a/themes/native/Resources/composed/gtk3_headerbar_border.png b/themes/native/Resources/composed/gtk3_headerbar_border.png
new file mode 100644
index 0000000..2a0811d
Binary files /dev/null and b/themes/native/Resources/composed/gtk3_headerbar_border.png differ
diff --git a/themes/native/Resources/composed/gtk3_progress_horz_chunk.png b/themes/native/Resources/composed/gtk3_progress_horz_chunk.png
new file mode 100644
index 0000000..9003d3f
Binary files /dev/null and b/themes/native/Resources/composed/gtk3_progress_horz_chunk.png differ
diff --git a/themes/native/Resources/composed/gtk3_progress_vert_chunk.png b/themes/native/Resources/composed/gtk3_progress_vert_chunk.png
new file mode 100644
index 0000000..77ad154
Binary files /dev/null and b/themes/native/Resources/composed/gtk3_progress_vert_chunk.png differ
diff --git a/themes/native/Resources/composed/notebook_tab_bottom.png b/themes/native/Resources/composed/notebook_tab_bottom.png
index ba4aa59..6133de4 100644
Binary files a/themes/native/Resources/composed/notebook_tab_bottom.png and b/themes/native/Resources/composed/notebook_tab_bottom.png differ
diff --git a/themes/native/Resources/composed/notebook_tab_left.png b/themes/native/Resources/composed/notebook_tab_left.png
index 8246784..f546729 100644
Binary files a/themes/native/Resources/composed/notebook_tab_left.png and b/themes/native/Resources/composed/notebook_tab_left.png differ
diff --git a/themes/native/Resources/composed/notebook_tab_right.png b/themes/native/Resources/composed/notebook_tab_right.png
index b2826fc..3d84d82 100644
Binary files a/themes/native/Resources/composed/notebook_tab_right.png and b/themes/native/Resources/composed/notebook_tab_right.png differ
diff --git a/themes/native/Resources/composed/notebook_tab_top.png b/themes/native/Resources/composed/notebook_tab_top.png
index 8def054..c06ccb0 100644
Binary files a/themes/native/Resources/composed/notebook_tab_top.png and b/themes/native/Resources/composed/notebook_tab_top.png differ
diff --git a/themes/native/Resources/composed/progress.png b/themes/native/Resources/composed/progress.png
index f14c735..934fe72 100644
Binary files a/themes/native/Resources/composed/progress.png and b/themes/native/Resources/composed/progress.png differ
diff --git a/themes/native/Resources/composed/scale_horz_slider.png b/themes/native/Resources/composed/scale_horz_slider.png
index a17dcf9..ad5a38b 100644
Binary files a/themes/native/Resources/composed/scale_horz_slider.png and b/themes/native/Resources/composed/scale_horz_slider.png differ
diff --git a/themes/native/Resources/composed/scale_horz_slider_inactive.png b/themes/native/Resources/composed/scale_horz_slider_inactive.png
deleted file mode 120000
index a9039bf..0000000
--- a/themes/native/Resources/composed/scale_horz_slider_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-scale_horz_slider_press.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/scale_horz_slider_inactive.png b/themes/native/Resources/composed/scale_horz_slider_inactive.png
new file mode 100644
index 0000000..374ff9b
Binary files /dev/null and b/themes/native/Resources/composed/scale_horz_slider_inactive.png differ
diff --git a/themes/native/Resources/composed/scale_horz_slider_press.png b/themes/native/Resources/composed/scale_horz_slider_press.png
index 645e169..374ff9b 100644
Binary files a/themes/native/Resources/composed/scale_horz_slider_press.png and b/themes/native/Resources/composed/scale_horz_slider_press.png differ
diff --git a/themes/native/Resources/composed/scale_vert_slider.png b/themes/native/Resources/composed/scale_vert_slider.png
index abc8f6b..c24c35c 100644
Binary files a/themes/native/Resources/composed/scale_vert_slider.png and b/themes/native/Resources/composed/scale_vert_slider.png differ
diff --git a/themes/native/Resources/composed/scale_vert_slider_inactive.png b/themes/native/Resources/composed/scale_vert_slider_inactive.png
deleted file mode 120000
index 09d7032..0000000
--- a/themes/native/Resources/composed/scale_vert_slider_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-scale_vert_slider_press.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/scale_vert_slider_inactive.png b/themes/native/Resources/composed/scale_vert_slider_inactive.png
new file mode 100644
index 0000000..4e64576
Binary files /dev/null and b/themes/native/Resources/composed/scale_vert_slider_inactive.png differ
diff --git a/themes/native/Resources/composed/scale_vert_slider_press.png b/themes/native/Resources/composed/scale_vert_slider_press.png
index fc968e6..4e64576 100644
Binary files a/themes/native/Resources/composed/scale_vert_slider_press.png and b/themes/native/Resources/composed/scale_vert_slider_press.png differ
diff --git a/themes/native/Resources/composed/scrollbar_button.png b/themes/native/Resources/composed/scrollbar_button.png
new file mode 100644
index 0000000..2e3192f
Binary files /dev/null and b/themes/native/Resources/composed/scrollbar_button.png differ
diff --git a/themes/native/Resources/composed/scrollbar_button_border.png b/themes/native/Resources/composed/scrollbar_button_border.png
deleted file mode 100644
index 7a5f996..0000000
Binary files a/themes/native/Resources/composed/scrollbar_button_border.png and /dev/null differ
diff --git a/themes/native/Resources/composed/scrollbar_button_press.png b/themes/native/Resources/composed/scrollbar_button_press.png
new file mode 100644
index 0000000..8f174bf
Binary files /dev/null and b/themes/native/Resources/composed/scrollbar_button_press.png differ
diff --git a/themes/native/Resources/composed/scrollbar_button_press_border.png b/themes/native/Resources/composed/scrollbar_button_press_border.png
deleted file mode 100644
index b060a0c..0000000
Binary files a/themes/native/Resources/composed/scrollbar_button_press_border.png and /dev/null differ
diff --git a/themes/native/Resources/composed/scrollbar_slider.png b/themes/native/Resources/composed/scrollbar_slider.png
new file mode 100644
index 0000000..2e3192f
Binary files /dev/null and b/themes/native/Resources/composed/scrollbar_slider.png differ
diff --git a/themes/native/Resources/composed/scrollbar_slider_border.png b/themes/native/Resources/composed/scrollbar_slider_border.png
deleted file mode 120000
index cea785c..0000000
--- a/themes/native/Resources/composed/scrollbar_slider_border.png
+++ /dev/null
@@ -1 +0,0 @@
-scrollbar_button_border.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/spinbutton_down_glyph.png b/themes/native/Resources/composed/spinbutton_down_glyph.png
deleted file mode 120000
index 1759444..0000000
--- a/themes/native/Resources/composed/spinbutton_down_glyph.png
+++ /dev/null
@@ -1 +0,0 @@
-scrollbar_button_down_glyph.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/spinbutton_down_glyph.png b/themes/native/Resources/composed/spinbutton_down_glyph.png
new file mode 100644
index 0000000..9813bc6
Binary files /dev/null and b/themes/native/Resources/composed/spinbutton_down_glyph.png differ
diff --git a/themes/native/Resources/composed/spinbutton_down_glyph_inactive.png b/themes/native/Resources/composed/spinbutton_down_glyph_inactive.png
deleted file mode 120000
index f035ae9..0000000
--- a/themes/native/Resources/composed/spinbutton_down_glyph_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-scrollbar_button_down_glyph_inactive.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/spinbutton_down_glyph_inactive.png b/themes/native/Resources/composed/spinbutton_down_glyph_inactive.png
new file mode 100644
index 0000000..9f50263
Binary files /dev/null and b/themes/native/Resources/composed/spinbutton_down_glyph_inactive.png differ
diff --git a/themes/native/Resources/composed/spinbutton_up_glyph.png b/themes/native/Resources/composed/spinbutton_up_glyph.png
deleted file mode 120000
index bbfeef9..0000000
--- a/themes/native/Resources/composed/spinbutton_up_glyph.png
+++ /dev/null
@@ -1 +0,0 @@
-scrollbar_button_up_glyph.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/spinbutton_up_glyph.png b/themes/native/Resources/composed/spinbutton_up_glyph.png
new file mode 100644
index 0000000..f8254c7
Binary files /dev/null and b/themes/native/Resources/composed/spinbutton_up_glyph.png differ
diff --git a/themes/native/Resources/composed/spinbutton_up_glyph_inactive.png b/themes/native/Resources/composed/spinbutton_up_glyph_inactive.png
deleted file mode 120000
index db101b1..0000000
--- a/themes/native/Resources/composed/spinbutton_up_glyph_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-scrollbar_button_up_glyph_inactive.png
\ No newline at end of file
diff --git a/themes/native/Resources/composed/spinbutton_up_glyph_inactive.png b/themes/native/Resources/composed/spinbutton_up_glyph_inactive.png
new file mode 100644
index 0000000..cbbce6c
Binary files /dev/null and b/themes/native/Resources/composed/spinbutton_up_glyph_inactive.png differ
diff --git a/themes/native/Resources/composed/tab_vert_gap.png b/themes/native/Resources/composed/tab_vert_gap.png
deleted file mode 100644
index f9c434f..0000000
Binary files a/themes/native/Resources/composed/tab_vert_gap.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/border.png b/themes/native/Resources/gtk-2.0/border.png
deleted file mode 100644
index cf4e623..0000000
Binary files a/themes/native/Resources/gtk-2.0/border.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/button_toolbar_hover.png b/themes/native/Resources/gtk-2.0/button_toolbar_hover.png
deleted file mode 100644
index a51a440..0000000
Binary files a/themes/native/Resources/gtk-2.0/button_toolbar_hover.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/button_toolbar_press.png b/themes/native/Resources/gtk-2.0/button_toolbar_press.png
deleted file mode 100644
index fc9661f..0000000
Binary files a/themes/native/Resources/gtk-2.0/button_toolbar_press.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/entry_borders.png b/themes/native/Resources/gtk-2.0/entry_borders.png
deleted file mode 100644
index b414b37..0000000
Binary files a/themes/native/Resources/gtk-2.0/entry_borders.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/entry_inactive_body.png b/themes/native/Resources/gtk-2.0/entry_inactive_body.png
deleted file mode 100644
index 5e23496..0000000
Binary files a/themes/native/Resources/gtk-2.0/entry_inactive_body.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/entry_inactive_borders.png b/themes/native/Resources/gtk-2.0/entry_inactive_borders.png
deleted file mode 100644
index 8ca0ce9..0000000
Binary files a/themes/native/Resources/gtk-2.0/entry_inactive_borders.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/frame.png b/themes/native/Resources/gtk-2.0/frame.png
deleted file mode 100644
index 9445b2f..0000000
Binary files a/themes/native/Resources/gtk-2.0/frame.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/frame_inline.png b/themes/native/Resources/gtk-2.0/frame_inline.png
deleted file mode 100644
index 0d05df9..0000000
Binary files a/themes/native/Resources/gtk-2.0/frame_inline.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/frame_tabs.png b/themes/native/Resources/gtk-2.0/frame_tabs.png
deleted file mode 100644
index 2a2550e..0000000
Binary files a/themes/native/Resources/gtk-2.0/frame_tabs.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/pan_down_arrow_inactive.png b/themes/native/Resources/gtk-2.0/pan_down_arrow_inactive.png
deleted file mode 100644
index 0c9cdeb..0000000
Binary files a/themes/native/Resources/gtk-2.0/pan_down_arrow_inactive.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/pan_left_arrow_inactive.png b/themes/native/Resources/gtk-2.0/pan_left_arrow_inactive.png
deleted file mode 100644
index e66ce3e..0000000
Binary files a/themes/native/Resources/gtk-2.0/pan_left_arrow_inactive.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/pan_right_arrow_inactive.png b/themes/native/Resources/gtk-2.0/pan_right_arrow_inactive.png
deleted file mode 100644
index 87681d2..0000000
Binary files a/themes/native/Resources/gtk-2.0/pan_right_arrow_inactive.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/pan_up_arrow_inactive.png b/themes/native/Resources/gtk-2.0/pan_up_arrow_inactive.png
deleted file mode 100644
index 03994d9..0000000
Binary files a/themes/native/Resources/gtk-2.0/pan_up_arrow_inactive.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/progress_horz_bar.png b/themes/native/Resources/gtk-2.0/progress_horz_bar.png
deleted file mode 100644
index df728bc..0000000
Binary files a/themes/native/Resources/gtk-2.0/progress_horz_bar.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/progress_horz_trough.png b/themes/native/Resources/gtk-2.0/progress_horz_trough.png
deleted file mode 100644
index e5d637e..0000000
Binary files a/themes/native/Resources/gtk-2.0/progress_horz_trough.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/progress_vert_bar.png b/themes/native/Resources/gtk-2.0/progress_vert_bar.png
deleted file mode 100644
index 0d85583..0000000
Binary files a/themes/native/Resources/gtk-2.0/progress_vert_bar.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/progress_vert_trough.png b/themes/native/Resources/gtk-2.0/progress_vert_trough.png
deleted file mode 100644
index dbd0735..0000000
Binary files a/themes/native/Resources/gtk-2.0/progress_vert_trough.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_horz_slider.png b/themes/native/Resources/gtk-2.0/scale_horz_slider.png
deleted file mode 100644
index 90f5f7a..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_horz_slider.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_horz_slider_hover.png b/themes/native/Resources/gtk-2.0/scale_horz_slider_hover.png
deleted file mode 100644
index 26f5039..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_horz_slider_hover.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_horz_slider_inactive.png b/themes/native/Resources/gtk-2.0/scale_horz_slider_inactive.png
deleted file mode 100644
index 7a4ca3a..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_horz_slider_inactive.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_horz_slider_press.png b/themes/native/Resources/gtk-2.0/scale_horz_slider_press.png
deleted file mode 100644
index d066e8e..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_horz_slider_press.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_horz_trough_lower.png b/themes/native/Resources/gtk-2.0/scale_horz_trough_lower.png
deleted file mode 100644
index e2f68ce..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_horz_trough_lower.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_horz_trough_upper.png b/themes/native/Resources/gtk-2.0/scale_horz_trough_upper.png
deleted file mode 100644
index e3caac7..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_horz_trough_upper.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_vert_slider.png b/themes/native/Resources/gtk-2.0/scale_vert_slider.png
deleted file mode 100644
index c25f4d4..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_vert_slider.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_vert_slider_hover.png b/themes/native/Resources/gtk-2.0/scale_vert_slider_hover.png
deleted file mode 100644
index 91548d0..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_vert_slider_hover.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_vert_slider_inactive.png b/themes/native/Resources/gtk-2.0/scale_vert_slider_inactive.png
deleted file mode 100644
index 8c28741..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_vert_slider_inactive.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_vert_slider_press.png b/themes/native/Resources/gtk-2.0/scale_vert_slider_press.png
deleted file mode 100644
index c4ad189..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_vert_slider_press.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_vert_trough_lower.png b/themes/native/Resources/gtk-2.0/scale_vert_trough_lower.png
deleted file mode 100644
index 6a13408..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_vert_trough_lower.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/scale_vert_trough_upper.png b/themes/native/Resources/gtk-2.0/scale_vert_trough_upper.png
deleted file mode 100644
index bbc8eb5..0000000
Binary files a/themes/native/Resources/gtk-2.0/scale_vert_trough_upper.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_background.png b/themes/native/Resources/gtk-2.0/spin_button_down_background.png
deleted file mode 100644
index 42a708b..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_down_background_rtl.png
deleted file mode 100644
index c39eb2c..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_down_glyph.png
deleted file mode 100644
index 040966f..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_hover_background.png b/themes/native/Resources/gtk-2.0/spin_button_down_hover_background.png
deleted file mode 100644
index dd5e8f4..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_hover_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_hover_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_down_hover_background_rtl.png
deleted file mode 100644
index 044e4b7..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_hover_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_hover_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_down_hover_glyph.png
deleted file mode 100644
index 040966f..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_hover_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_inactive_background.png b/themes/native/Resources/gtk-2.0/spin_button_down_inactive_background.png
deleted file mode 100644
index 0d6632a..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_inactive_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_inactive_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_down_inactive_background_rtl.png
deleted file mode 100644
index e31f8cc..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_inactive_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_inactive_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_down_inactive_glyph.png
deleted file mode 100644
index 6cb7296..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_inactive_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_press_background.png b/themes/native/Resources/gtk-2.0/spin_button_down_press_background.png
deleted file mode 100644
index 41d3e22..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_press_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_press_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_down_press_background_rtl.png
deleted file mode 100644
index e5f4c3b..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_press_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_down_press_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_down_press_glyph.png
deleted file mode 100644
index 040966f..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_down_press_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_background.png b/themes/native/Resources/gtk-2.0/spin_button_up_background.png
deleted file mode 100644
index ab15eb9..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_up_background_rtl.png
deleted file mode 100644
index 799344d..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_up_glyph.png
deleted file mode 100644
index 0f1cab2..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_hover_background.png b/themes/native/Resources/gtk-2.0/spin_button_up_hover_background.png
deleted file mode 100644
index 4d87d1e..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_hover_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_hover_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_up_hover_background_rtl.png
deleted file mode 100644
index 96a35f0..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_hover_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_hover_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_up_hover_glyph.png
deleted file mode 100644
index 0f1cab2..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_hover_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_inactive_background.png b/themes/native/Resources/gtk-2.0/spin_button_up_inactive_background.png
deleted file mode 100644
index 03aba97..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_inactive_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_inactive_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_up_inactive_background_rtl.png
deleted file mode 100644
index 222971f..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_inactive_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_inactive_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_up_inactive_glyph.png
deleted file mode 100644
index 8c368d9..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_inactive_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_press_background.png b/themes/native/Resources/gtk-2.0/spin_button_up_press_background.png
deleted file mode 100644
index 44f277f..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_press_background.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_press_background_rtl.png b/themes/native/Resources/gtk-2.0/spin_button_up_press_background_rtl.png
deleted file mode 100644
index ee40d02..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_press_background_rtl.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/spin_button_up_press_glyph.png b/themes/native/Resources/gtk-2.0/spin_button_up_press_glyph.png
deleted file mode 100644
index 0f1cab2..0000000
Binary files a/themes/native/Resources/gtk-2.0/spin_button_up_press_glyph.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_bottom.png b/themes/native/Resources/gtk-2.0/tab_bottom.png
deleted file mode 100644
index 49b0efd..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_bottom.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_bottom_active.png b/themes/native/Resources/gtk-2.0/tab_bottom_active.png
deleted file mode 100644
index 3018f70..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_bottom_active.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_left.png b/themes/native/Resources/gtk-2.0/tab_left.png
deleted file mode 100644
index 7dc98d3..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_left.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_left_active.png b/themes/native/Resources/gtk-2.0/tab_left_active.png
deleted file mode 100644
index 7bf68e7..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_left_active.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_right.png b/themes/native/Resources/gtk-2.0/tab_right.png
deleted file mode 100644
index e3e631c..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_right.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_right_active.png b/themes/native/Resources/gtk-2.0/tab_right_active.png
deleted file mode 100644
index c51cf86..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_right_active.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_top.png b/themes/native/Resources/gtk-2.0/tab_top.png
deleted file mode 100644
index 66b3d36..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_top.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_top_active.png b/themes/native/Resources/gtk-2.0/tab_top_active.png
deleted file mode 100644
index 54241f1..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_top_active.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/tab_vert_gap.png b/themes/native/Resources/gtk-2.0/tab_vert_gap.png
deleted file mode 100644
index f9c434f..0000000
Binary files a/themes/native/Resources/gtk-2.0/tab_vert_gap.png and /dev/null differ
diff --git a/themes/native/Resources/to_compose/button.mask.png b/themes/native/Resources/to_compose/button.mask.png
new file mode 100644
index 0000000..c81fed8
Binary files /dev/null and b/themes/native/Resources/to_compose/button.mask.png differ
diff --git a/themes/native/Resources/to_compose/button.src.png b/themes/native/Resources/to_compose/button.src.png
new file mode 100644
index 0000000..c2c9bda
Binary files /dev/null and b/themes/native/Resources/to_compose/button.src.png differ
diff --git a/themes/native/Resources/to_compose/button_active.mask.png b/themes/native/Resources/to_compose/button_active.mask.png
new file mode 120000
index 0000000..c7deed8
--- /dev/null
+++ b/themes/native/Resources/to_compose/button_active.mask.png
@@ -0,0 +1 @@
+button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/button_active.src.png b/themes/native/Resources/to_compose/button_active.src.png
new file mode 100644
index 0000000..e44caec
Binary files /dev/null and b/themes/native/Resources/to_compose/button_active.src.png differ
diff --git a/themes/native/Resources/to_compose/button_press.mask.png b/themes/native/Resources/to_compose/button_press.mask.png
new file mode 120000
index 0000000..c7deed8
--- /dev/null
+++ b/themes/native/Resources/to_compose/button_press.mask.png
@@ -0,0 +1 @@
+button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/button_press.src.png b/themes/native/Resources/to_compose/button_press.src.png
new file mode 100644
index 0000000..6011b25
Binary files /dev/null and b/themes/native/Resources/to_compose/button_press.src.png differ
diff --git a/themes/native/Resources/to_compose/button_toolbar_hover.mask.png b/themes/native/Resources/to_compose/button_toolbar_hover.mask.png
new file mode 120000
index 0000000..c7deed8
--- /dev/null
+++ b/themes/native/Resources/to_compose/button_toolbar_hover.mask.png
@@ -0,0 +1 @@
+button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/button_toolbar_hover.src.png b/themes/native/Resources/to_compose/button_toolbar_hover.src.png
new file mode 100644
index 0000000..015fa88
Binary files /dev/null and b/themes/native/Resources/to_compose/button_toolbar_hover.src.png differ
diff --git a/themes/native/Resources/to_compose/button_toolbar_press.mask.png b/themes/native/Resources/to_compose/button_toolbar_press.mask.png
new file mode 120000
index 0000000..c7deed8
--- /dev/null
+++ b/themes/native/Resources/to_compose/button_toolbar_press.mask.png
@@ -0,0 +1 @@
+button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/button_toolbar_press.src.png b/themes/native/Resources/to_compose/button_toolbar_press.src.png
new file mode 100644
index 0000000..37e42c3
Binary files /dev/null and b/themes/native/Resources/to_compose/button_toolbar_press.src.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_check_glyph_menu.static.png b/themes/native/Resources/to_compose/checkbox_check_glyph_menu.static.png
new file mode 100644
index 0000000..8492f54
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_check_glyph_menu.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_check_glyph_menu_hover.static.png b/themes/native/Resources/to_compose/checkbox_check_glyph_menu_hover.static.png
new file mode 100644
index 0000000..a3f63b3
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_check_glyph_menu_hover.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_checked.static.png b/themes/native/Resources/to_compose/checkbox_checked.static.png
new file mode 100644
index 0000000..5f6c256
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_checked.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_checked_inactive.static.png b/themes/native/Resources/to_compose/checkbox_checked_inactive.static.png
new file mode 100644
index 0000000..9be44da
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_checked_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_checked_press.static.png b/themes/native/Resources/to_compose/checkbox_checked_press.static.png
new file mode 100644
index 0000000..ebeedc2
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_checked_press.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_indecisive.static.png b/themes/native/Resources/to_compose/checkbox_indecisive.static.png
new file mode 100644
index 0000000..bea0006
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_indecisive.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_indecisive_inactive.static.png b/themes/native/Resources/to_compose/checkbox_indecisive_inactive.static.png
new file mode 100644
index 0000000..b746474
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_indecisive_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_indecisive_press.static.png b/themes/native/Resources/to_compose/checkbox_indecisive_press.static.png
new file mode 100644
index 0000000..dd2bfc6
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_indecisive_press.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_unchecked.static.png b/themes/native/Resources/to_compose/checkbox_unchecked.static.png
new file mode 100644
index 0000000..1bdcec9
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_unchecked.static.png differ
diff --git a/themes/native/Resources/to_compose/checkbox_unchecked_press.static.png b/themes/native/Resources/to_compose/checkbox_unchecked_press.static.png
new file mode 100644
index 0000000..5f75abc
Binary files /dev/null and b/themes/native/Resources/to_compose/checkbox_unchecked_press.static.png differ
diff --git a/themes/native/Resources/to_compose/combobox_button_border.png b/themes/native/Resources/to_compose/combobox_button_border.png
deleted file mode 100644
index a9b2ff6..0000000
Binary files a/themes/native/Resources/to_compose/combobox_button_border.png and /dev/null differ
diff --git a/themes/native/Resources/to_compose/combobox_button_press_border.png b/themes/native/Resources/to_compose/combobox_button_press_border.png
deleted file mode 100644
index 074af2f..0000000
Binary files a/themes/native/Resources/to_compose/combobox_button_press_border.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/entry_body.png b/themes/native/Resources/to_compose/entry_body.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/entry_body.png
rename to themes/native/Resources/to_compose/entry_body.static.png
diff --git a/themes/native/Resources/to_compose/entry_border.static.png b/themes/native/Resources/to_compose/entry_border.static.png
new file mode 100644
index 0000000..412d938
Binary files /dev/null and b/themes/native/Resources/to_compose/entry_border.static.png differ
diff --git a/themes/native/Resources/to_compose/entry_inactive_body.static.png b/themes/native/Resources/to_compose/entry_inactive_body.static.png
new file mode 100644
index 0000000..d80d517
Binary files /dev/null and b/themes/native/Resources/to_compose/entry_inactive_body.static.png differ
diff --git a/themes/native/Resources/to_compose/entry_inactive_border.static.png b/themes/native/Resources/to_compose/entry_inactive_border.static.png
new file mode 100644
index 0000000..d3e6ec2
Binary files /dev/null and b/themes/native/Resources/to_compose/entry_inactive_border.static.png differ
diff --git a/themes/native/Resources/composed/border.png b/themes/native/Resources/to_compose/frame.static.png
similarity index 75%
rename from themes/native/Resources/composed/border.png
rename to themes/native/Resources/to_compose/frame.static.png
index 6c7e323..843bf13 100644
Binary files a/themes/native/Resources/composed/border.png and b/themes/native/Resources/to_compose/frame.static.png differ
diff --git a/themes/native/Resources/gtk-2.0/gripper.png b/themes/native/Resources/to_compose/gripper.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/gripper.png
rename to themes/native/Resources/to_compose/gripper.static.png
diff --git a/themes/native/Resources/gtk-2.0/gripper_horz.png b/themes/native/Resources/to_compose/gripper_horz.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/gripper_horz.png
rename to themes/native/Resources/to_compose/gripper_horz.static.png
diff --git a/themes/native/Resources/gtk-2.0/gripper_vert.png b/themes/native/Resources/to_compose/gripper_vert.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/gripper_vert.png
rename to themes/native/Resources/to_compose/gripper_vert.static.png
diff --git a/themes/native/Resources/to_compose/gtk3_combobox_button.mask.png b/themes/native/Resources/to_compose/gtk3_combobox_button.mask.png
new file mode 100644
index 0000000..b7aaa67
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_combobox_button.mask.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_combobox_button.src.png b/themes/native/Resources/to_compose/gtk3_combobox_button.src.png
new file mode 100644
index 0000000..e39c2ee
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_combobox_button.src.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_combobox_button_inactive.mask.png b/themes/native/Resources/to_compose/gtk3_combobox_button_inactive.mask.png
new file mode 120000
index 0000000..d9ee38b
--- /dev/null
+++ b/themes/native/Resources/to_compose/gtk3_combobox_button_inactive.mask.png
@@ -0,0 +1 @@
+gtk3_combobox_button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/gtk3_combobox_button_inactive.src.png b/themes/native/Resources/to_compose/gtk3_combobox_button_inactive.src.png
new file mode 100644
index 0000000..9002d40
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_combobox_button_inactive.src.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_combobox_button_press.mask.png b/themes/native/Resources/to_compose/gtk3_combobox_button_press.mask.png
new file mode 120000
index 0000000..d9ee38b
--- /dev/null
+++ b/themes/native/Resources/to_compose/gtk3_combobox_button_press.mask.png
@@ -0,0 +1 @@
+gtk3_combobox_button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/gtk3_combobox_button_press.src.png b/themes/native/Resources/to_compose/gtk3_combobox_button_press.src.png
new file mode 100644
index 0000000..81c6118
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_combobox_button_press.src.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_headerbar_border.mask.png b/themes/native/Resources/to_compose/gtk3_headerbar_border.mask.png
new file mode 100644
index 0000000..07c5a89
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_headerbar_border.mask.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_headerbar_border.src.png b/themes/native/Resources/to_compose/gtk3_headerbar_border.src.png
new file mode 100644
index 0000000..a54ba03
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_headerbar_border.src.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_progress_horz_chunk.mask.png b/themes/native/Resources/to_compose/gtk3_progress_horz_chunk.mask.png
new file mode 100644
index 0000000..4237001
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_progress_horz_chunk.mask.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_progress_horz_chunk.src.png b/themes/native/Resources/to_compose/gtk3_progress_horz_chunk.src.png
new file mode 100644
index 0000000..c53fc13
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_progress_horz_chunk.src.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_progress_vert_chunk.mask.png b/themes/native/Resources/to_compose/gtk3_progress_vert_chunk.mask.png
new file mode 100644
index 0000000..2a8ad3d
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_progress_vert_chunk.mask.png differ
diff --git a/themes/native/Resources/to_compose/gtk3_progress_vert_chunk.src.png b/themes/native/Resources/to_compose/gtk3_progress_vert_chunk.src.png
new file mode 100644
index 0000000..aefcf90
Binary files /dev/null and b/themes/native/Resources/to_compose/gtk3_progress_vert_chunk.src.png differ
diff --git a/themes/native/Resources/to_compose/headerbar_border.png b/themes/native/Resources/to_compose/headerbar_border.png
deleted file mode 100644
index 6095d0a..0000000
Binary files a/themes/native/Resources/to_compose/headerbar_border.png and /dev/null differ
diff --git a/themes/native/Resources/gtk-2.0/line.png b/themes/native/Resources/to_compose/line.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/line.png
rename to themes/native/Resources/to_compose/line.static.png
diff --git a/themes/native/Resources/to_compose/notebook_frame_border.static.png b/themes/native/Resources/to_compose/notebook_frame_border.static.png
new file mode 100644
index 0000000..75482fd
Binary files /dev/null and b/themes/native/Resources/to_compose/notebook_frame_border.static.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_bottom.mask.png b/themes/native/Resources/to_compose/notebook_tab_bottom.mask.png
new file mode 100644
index 0000000..5501565
Binary files /dev/null and b/themes/native/Resources/to_compose/notebook_tab_bottom.mask.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_bottom.png b/themes/native/Resources/to_compose/notebook_tab_bottom.src.png
similarity index 85%
rename from themes/native/Resources/to_compose/notebook_tab_bottom.png
rename to themes/native/Resources/to_compose/notebook_tab_bottom.src.png
index 3a2d170..ba4aa59 100644
Binary files a/themes/native/Resources/to_compose/notebook_tab_bottom.png and b/themes/native/Resources/to_compose/notebook_tab_bottom.src.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_left.mask.png b/themes/native/Resources/to_compose/notebook_tab_left.mask.png
new file mode 100644
index 0000000..913cce4
Binary files /dev/null and b/themes/native/Resources/to_compose/notebook_tab_left.mask.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_left.png b/themes/native/Resources/to_compose/notebook_tab_left.src.png
similarity index 86%
rename from themes/native/Resources/to_compose/notebook_tab_left.png
rename to themes/native/Resources/to_compose/notebook_tab_left.src.png
index 050a62f..8246784 100644
Binary files a/themes/native/Resources/to_compose/notebook_tab_left.png and b/themes/native/Resources/to_compose/notebook_tab_left.src.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_right.mask.png b/themes/native/Resources/to_compose/notebook_tab_right.mask.png
new file mode 100644
index 0000000..d3db4e9
Binary files /dev/null and b/themes/native/Resources/to_compose/notebook_tab_right.mask.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_right.png b/themes/native/Resources/to_compose/notebook_tab_right.src.png
similarity index 86%
rename from themes/native/Resources/to_compose/notebook_tab_right.png
rename to themes/native/Resources/to_compose/notebook_tab_right.src.png
index 73dd4fd..b2826fc 100644
Binary files a/themes/native/Resources/to_compose/notebook_tab_right.png and b/themes/native/Resources/to_compose/notebook_tab_right.src.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_top.mask.png b/themes/native/Resources/to_compose/notebook_tab_top.mask.png
new file mode 100644
index 0000000..fbf6c59
Binary files /dev/null and b/themes/native/Resources/to_compose/notebook_tab_top.mask.png differ
diff --git a/themes/native/Resources/to_compose/notebook_tab_top.png b/themes/native/Resources/to_compose/notebook_tab_top.src.png
similarity index 87%
rename from themes/native/Resources/to_compose/notebook_tab_top.png
rename to themes/native/Resources/to_compose/notebook_tab_top.src.png
index d83b002..8def054 100644
Binary files a/themes/native/Resources/to_compose/notebook_tab_top.png and b/themes/native/Resources/to_compose/notebook_tab_top.src.png differ
diff --git a/themes/native/Resources/gtk-2.0/pan_down_arrow.png b/themes/native/Resources/to_compose/pan_down_arrow.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_down_arrow.png
rename to themes/native/Resources/to_compose/pan_down_arrow.static.png
diff --git a/themes/native/Resources/gtk-2.0/pan_down_arrow_hover.png b/themes/native/Resources/to_compose/pan_down_arrow_hover.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_down_arrow_hover.png
rename to themes/native/Resources/to_compose/pan_down_arrow_hover.static.png
diff --git a/themes/native/Resources/to_compose/pan_down_arrow_inactive.static.png b/themes/native/Resources/to_compose/pan_down_arrow_inactive.static.png
new file mode 100644
index 0000000..d4f1465
Binary files /dev/null and b/themes/native/Resources/to_compose/pan_down_arrow_inactive.static.png differ
diff --git a/themes/native/Resources/gtk-2.0/pan_left_arrow.png b/themes/native/Resources/to_compose/pan_left_arrow.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_left_arrow.png
rename to themes/native/Resources/to_compose/pan_left_arrow.static.png
diff --git a/themes/native/Resources/gtk-2.0/pan_left_arrow_hover.png b/themes/native/Resources/to_compose/pan_left_arrow_hover.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_left_arrow_hover.png
rename to themes/native/Resources/to_compose/pan_left_arrow_hover.static.png
diff --git a/themes/native/Resources/to_compose/pan_left_arrow_inactive.static.png b/themes/native/Resources/to_compose/pan_left_arrow_inactive.static.png
new file mode 100644
index 0000000..11d1579
Binary files /dev/null and b/themes/native/Resources/to_compose/pan_left_arrow_inactive.static.png differ
diff --git a/themes/native/Resources/gtk-2.0/pan_right_arrow.png b/themes/native/Resources/to_compose/pan_right_arrow.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_right_arrow.png
rename to themes/native/Resources/to_compose/pan_right_arrow.static.png
diff --git a/themes/native/Resources/gtk-2.0/pan_right_arrow_hover.png b/themes/native/Resources/to_compose/pan_right_arrow_hover.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_right_arrow_hover.png
rename to themes/native/Resources/to_compose/pan_right_arrow_hover.static.png
diff --git a/themes/native/Resources/to_compose/pan_right_arrow_inactive.static.png b/themes/native/Resources/to_compose/pan_right_arrow_inactive.static.png
new file mode 100644
index 0000000..9313ccc
Binary files /dev/null and b/themes/native/Resources/to_compose/pan_right_arrow_inactive.static.png differ
diff --git a/themes/native/Resources/gtk-2.0/pan_se_arrow.png b/themes/native/Resources/to_compose/pan_se_arrow.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_se_arrow.png
rename to themes/native/Resources/to_compose/pan_se_arrow.static.png
diff --git a/themes/native/Resources/gtk-2.0/pan_sw_arrow.png b/themes/native/Resources/to_compose/pan_sw_arrow.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_sw_arrow.png
rename to themes/native/Resources/to_compose/pan_sw_arrow.static.png
diff --git a/themes/native/Resources/gtk-2.0/pan_up_arrow.png b/themes/native/Resources/to_compose/pan_up_arrow.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_up_arrow.png
rename to themes/native/Resources/to_compose/pan_up_arrow.static.png
diff --git a/themes/native/Resources/gtk-2.0/pan_up_arrow_hover.png b/themes/native/Resources/to_compose/pan_up_arrow_hover.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/pan_up_arrow_hover.png
rename to themes/native/Resources/to_compose/pan_up_arrow_hover.static.png
diff --git a/themes/native/Resources/to_compose/pan_up_arrow_inactive.static.png b/themes/native/Resources/to_compose/pan_up_arrow_inactive.static.png
new file mode 100644
index 0000000..aa25c00
Binary files /dev/null and b/themes/native/Resources/to_compose/pan_up_arrow_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/progress.mask.png b/themes/native/Resources/to_compose/progress.mask.png
new file mode 100644
index 0000000..0667119
Binary files /dev/null and b/themes/native/Resources/to_compose/progress.mask.png differ
diff --git a/themes/native/Resources/to_compose/progress.src.png b/themes/native/Resources/to_compose/progress.src.png
new file mode 100644
index 0000000..2338d77
Binary files /dev/null and b/themes/native/Resources/to_compose/progress.src.png differ
diff --git a/themes/native/Resources/to_compose/progress_trough.static.png b/themes/native/Resources/to_compose/progress_trough.static.png
new file mode 100644
index 0000000..66c2e79
Binary files /dev/null and b/themes/native/Resources/to_compose/progress_trough.static.png differ
diff --git a/themes/native/Resources/to_compose/radio_checked.static.png b/themes/native/Resources/to_compose/radio_checked.static.png
new file mode 100644
index 0000000..9be35a2
Binary files /dev/null and b/themes/native/Resources/to_compose/radio_checked.static.png differ
diff --git a/themes/native/Resources/to_compose/radio_checked_inactive.static.png b/themes/native/Resources/to_compose/radio_checked_inactive.static.png
new file mode 100644
index 0000000..7abdc13
Binary files /dev/null and b/themes/native/Resources/to_compose/radio_checked_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/radio_checked_press.static.png b/themes/native/Resources/to_compose/radio_checked_press.static.png
new file mode 100644
index 0000000..868b6ad
Binary files /dev/null and b/themes/native/Resources/to_compose/radio_checked_press.static.png differ
diff --git a/themes/native/Resources/to_compose/radio_unchecked.static.png b/themes/native/Resources/to_compose/radio_unchecked.static.png
new file mode 100644
index 0000000..58bb984
Binary files /dev/null and b/themes/native/Resources/to_compose/radio_unchecked.static.png differ
diff --git a/themes/native/Resources/to_compose/radio_unchecked_press.static.png b/themes/native/Resources/to_compose/radio_unchecked_press.static.png
new file mode 100644
index 0000000..22df644
Binary files /dev/null and b/themes/native/Resources/to_compose/radio_unchecked_press.static.png differ
diff --git a/themes/native/Resources/to_compose/scale_horz_slider.mask.png b/themes/native/Resources/to_compose/scale_horz_slider.mask.png
new file mode 100644
index 0000000..2cf3814
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_horz_slider.mask.png differ
diff --git a/themes/native/Resources/to_compose/scale_horz_slider.src.png b/themes/native/Resources/to_compose/scale_horz_slider.src.png
new file mode 100644
index 0000000..0835cea
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_horz_slider.src.png differ
diff --git a/themes/native/Resources/to_compose/scale_horz_slider_inactive.mask.png b/themes/native/Resources/to_compose/scale_horz_slider_inactive.mask.png
new file mode 120000
index 0000000..497d243
--- /dev/null
+++ b/themes/native/Resources/to_compose/scale_horz_slider_inactive.mask.png
@@ -0,0 +1 @@
+scale_horz_slider.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scale_horz_slider_inactive.src.png b/themes/native/Resources/to_compose/scale_horz_slider_inactive.src.png
new file mode 120000
index 0000000..8b465c0
--- /dev/null
+++ b/themes/native/Resources/to_compose/scale_horz_slider_inactive.src.png
@@ -0,0 +1 @@
+scale_horz_slider_press.src.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scale_horz_slider_press.mask.png b/themes/native/Resources/to_compose/scale_horz_slider_press.mask.png
new file mode 120000
index 0000000..497d243
--- /dev/null
+++ b/themes/native/Resources/to_compose/scale_horz_slider_press.mask.png
@@ -0,0 +1 @@
+scale_horz_slider.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scale_horz_slider_press.src.png b/themes/native/Resources/to_compose/scale_horz_slider_press.src.png
new file mode 100644
index 0000000..cdac65c
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_horz_slider_press.src.png differ
diff --git a/themes/native/Resources/to_compose/scale_horz_trough_lower.static.png b/themes/native/Resources/to_compose/scale_horz_trough_lower.static.png
new file mode 100644
index 0000000..ac205d3
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_horz_trough_lower.static.png differ
diff --git a/themes/native/Resources/to_compose/scale_horz_trough_upper.static.png b/themes/native/Resources/to_compose/scale_horz_trough_upper.static.png
new file mode 100644
index 0000000..856104e
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_horz_trough_upper.static.png differ
diff --git a/themes/native/Resources/to_compose/scale_vert_slider.mask.png b/themes/native/Resources/to_compose/scale_vert_slider.mask.png
new file mode 100644
index 0000000..b9a6481
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_vert_slider.mask.png differ
diff --git a/themes/native/Resources/to_compose/scale_vert_slider.src.png b/themes/native/Resources/to_compose/scale_vert_slider.src.png
new file mode 100644
index 0000000..864055c
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_vert_slider.src.png differ
diff --git a/themes/native/Resources/to_compose/scale_vert_slider_inactive.mask.png b/themes/native/Resources/to_compose/scale_vert_slider_inactive.mask.png
new file mode 120000
index 0000000..e0251b7
--- /dev/null
+++ b/themes/native/Resources/to_compose/scale_vert_slider_inactive.mask.png
@@ -0,0 +1 @@
+scale_vert_slider.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scale_vert_slider_inactive.src.png b/themes/native/Resources/to_compose/scale_vert_slider_inactive.src.png
new file mode 120000
index 0000000..174c127
--- /dev/null
+++ b/themes/native/Resources/to_compose/scale_vert_slider_inactive.src.png
@@ -0,0 +1 @@
+scale_vert_slider_press.src.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scale_vert_slider_press.mask.png b/themes/native/Resources/to_compose/scale_vert_slider_press.mask.png
new file mode 120000
index 0000000..e0251b7
--- /dev/null
+++ b/themes/native/Resources/to_compose/scale_vert_slider_press.mask.png
@@ -0,0 +1 @@
+scale_vert_slider.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scale_vert_slider_press.src.png b/themes/native/Resources/to_compose/scale_vert_slider_press.src.png
new file mode 100644
index 0000000..9e5ab9c
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_vert_slider_press.src.png differ
diff --git a/themes/native/Resources/to_compose/scale_vert_trough_lower.static.png b/themes/native/Resources/to_compose/scale_vert_trough_lower.static.png
new file mode 100644
index 0000000..b6c6525
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_vert_trough_lower.static.png differ
diff --git a/themes/native/Resources/to_compose/scale_vert_trough_upper.static.png b/themes/native/Resources/to_compose/scale_vert_trough_upper.static.png
new file mode 100644
index 0000000..631fc0b
Binary files /dev/null and b/themes/native/Resources/to_compose/scale_vert_trough_upper.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button.mask.png b/themes/native/Resources/to_compose/scrollbar_button.mask.png
new file mode 100644
index 0000000..c797427
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button.mask.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button.src.png b/themes/native/Resources/to_compose/scrollbar_button.src.png
new file mode 100644
index 0000000..a10347d
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button.src.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_border.png b/themes/native/Resources/to_compose/scrollbar_button_border.png
deleted file mode 100644
index b2c430e..0000000
Binary files a/themes/native/Resources/to_compose/scrollbar_button_border.png and /dev/null differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_down_glyph.static.png b/themes/native/Resources/to_compose/scrollbar_button_down_glyph.static.png
new file mode 100644
index 0000000..9813bc6
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_down_glyph.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_down_glyph_inactive.static.png b/themes/native/Resources/to_compose/scrollbar_button_down_glyph_inactive.static.png
new file mode 100644
index 0000000..9f50263
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_down_glyph_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_left_glyph.static.png b/themes/native/Resources/to_compose/scrollbar_button_left_glyph.static.png
new file mode 100644
index 0000000..504c0d8
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_left_glyph.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_left_glyph_inactive.static.png b/themes/native/Resources/to_compose/scrollbar_button_left_glyph_inactive.static.png
new file mode 100644
index 0000000..bb56f98
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_left_glyph_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_press.mask.png b/themes/native/Resources/to_compose/scrollbar_button_press.mask.png
new file mode 100644
index 0000000..c797427
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_press.mask.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_press.src.png b/themes/native/Resources/to_compose/scrollbar_button_press.src.png
new file mode 100644
index 0000000..5fd21b7
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_press.src.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_press_border.png b/themes/native/Resources/to_compose/scrollbar_button_press_border.png
deleted file mode 100644
index 099da5e..0000000
Binary files a/themes/native/Resources/to_compose/scrollbar_button_press_border.png and /dev/null differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_right_glyph.static.png b/themes/native/Resources/to_compose/scrollbar_button_right_glyph.static.png
new file mode 100644
index 0000000..14d53de
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_right_glyph.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_right_glyph_inactive.static.png b/themes/native/Resources/to_compose/scrollbar_button_right_glyph_inactive.static.png
new file mode 100644
index 0000000..c48a084
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_right_glyph_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_up_glyph.static.png b/themes/native/Resources/to_compose/scrollbar_button_up_glyph.static.png
new file mode 100644
index 0000000..f8254c7
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_up_glyph.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_button_up_glyph_inactive.static.png b/themes/native/Resources/to_compose/scrollbar_button_up_glyph_inactive.static.png
new file mode 100644
index 0000000..cbbce6c
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_button_up_glyph_inactive.static.png differ
diff --git a/themes/native/Resources/to_compose/scrollbar_slider.mask.png b/themes/native/Resources/to_compose/scrollbar_slider.mask.png
new file mode 120000
index 0000000..89a10cd
--- /dev/null
+++ b/themes/native/Resources/to_compose/scrollbar_slider.mask.png
@@ -0,0 +1 @@
+scrollbar_button.mask.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scrollbar_slider.src.png b/themes/native/Resources/to_compose/scrollbar_slider.src.png
new file mode 120000
index 0000000..c7b16a5
--- /dev/null
+++ b/themes/native/Resources/to_compose/scrollbar_slider.src.png
@@ -0,0 +1 @@
+scrollbar_button.src.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/scrollbar_trough.static.png b/themes/native/Resources/to_compose/scrollbar_trough.static.png
new file mode 100644
index 0000000..f36d324
Binary files /dev/null and b/themes/native/Resources/to_compose/scrollbar_trough.static.png differ
diff --git a/themes/native/Resources/to_compose/spinbutton_down_glyph.static.png b/themes/native/Resources/to_compose/spinbutton_down_glyph.static.png
new file mode 120000
index 0000000..b2d7483
--- /dev/null
+++ b/themes/native/Resources/to_compose/spinbutton_down_glyph.static.png
@@ -0,0 +1 @@
+scrollbar_button_down_glyph.static.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/spinbutton_down_glyph_inactive.static.png b/themes/native/Resources/to_compose/spinbutton_down_glyph_inactive.static.png
new file mode 120000
index 0000000..04e53d2
--- /dev/null
+++ b/themes/native/Resources/to_compose/spinbutton_down_glyph_inactive.static.png
@@ -0,0 +1 @@
+scrollbar_button_down_glyph_inactive.static.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/spinbutton_up_glyph.static.png b/themes/native/Resources/to_compose/spinbutton_up_glyph.static.png
new file mode 120000
index 0000000..d1855fa
--- /dev/null
+++ b/themes/native/Resources/to_compose/spinbutton_up_glyph.static.png
@@ -0,0 +1 @@
+scrollbar_button_up_glyph.static.png
\ No newline at end of file
diff --git a/themes/native/Resources/to_compose/spinbutton_up_glyph_inactive.static.png b/themes/native/Resources/to_compose/spinbutton_up_glyph_inactive.static.png
new file mode 120000
index 0000000..3d5bc51
--- /dev/null
+++ b/themes/native/Resources/to_compose/spinbutton_up_glyph_inactive.static.png
@@ -0,0 +1 @@
+scrollbar_button_up_glyph_inactive.static.png
\ No newline at end of file
diff --git a/themes/native/Resources/gtk-2.0/tab_horz_gap.png b/themes/native/Resources/to_compose/tab_horz_gap.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/tab_horz_gap.png
rename to themes/native/Resources/to_compose/tab_horz_gap.static.png
diff --git a/themes/native/Resources/gtk-2.0/treeview_separator.png b/themes/native/Resources/to_compose/treeview_separator.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/treeview_separator.png
rename to themes/native/Resources/to_compose/treeview_separator.static.png
diff --git a/themes/native/Resources/gtk-2.0/treeview_separator_rtl.png b/themes/native/Resources/to_compose/treeview_separator_rtl.static.png
similarity index 100%
rename from themes/native/Resources/gtk-2.0/treeview_separator_rtl.png
rename to themes/native/Resources/to_compose/treeview_separator_rtl.static.png