diff --git a/app/ui/icons/CMakeLists.txt b/app/ui/icons/CMakeLists.txt
index a9e2eb667..83cb55606 100644
--- a/app/ui/icons/CMakeLists.txt
+++ b/app/ui/icons/CMakeLists.txt
@@ -20,10 +20,3 @@ set(OLIVE_SOURCES
   ui/icons/icons.cpp
   PARENT_SCOPE
 )
-
-set(OLIVE_RESOURCES
-  ${OLIVE_RESOURCES}
-  ui/icons/olive-dark/olive-dark.qrc
-  ui/icons/olive-light/olive-light.qrc
-  PARENT_SCOPE
-)
diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp
index 501ea9181..59bf96ecc 100644
--- a/app/ui/icons/icons.cpp
+++ b/app/ui/icons/icons.cpp
@@ -114,7 +114,7 @@ QIcon olive::icon::Create(const QString& theme, const QString &name)
   QIcon icon;
 
   for (int i=0;i<ICON_SIZE_COUNT;i++) {
-    icon.addFile(QString(":/icons/%1/%2.%3.png").arg(theme, name, QString::number(ICON_SIZES[i])),
+    icon.addFile(QString(":/style/%1/png/%2.%3.png").arg(theme, name, QString::number(ICON_SIZES[i])),
                  QSize(ICON_SIZES[i], ICON_SIZES[i]));
   }
 
diff --git a/app/ui/icons/olive-dark/olive-dark.qrc b/app/ui/icons/olive-dark/olive-dark.qrc
deleted file mode 100644
index d0297ed36..000000000
--- a/app/ui/icons/olive-dark/olive-dark.qrc
+++ /dev/null
@@ -1,200 +0,0 @@
-<RCC>
-  <qresource prefix="/icons/olive-dark">
-    <file>add-button.16.png</file>
-    <file>add-button.32.png</file>
-    <file>add-button.64.png</file>
-    <file>add-button.128.png</file>
-    <file>add-effect.16.png</file>
-    <file>add-effect.32.png</file>
-    <file>add-effect.64.png</file>
-    <file>add-effect.128.png</file>
-    <file>add-transition.16.png</file>
-    <file>add-transition.32.png</file>
-    <file>add-transition.64.png</file>
-    <file>add-transition.128.png</file>
-    <file>align-center.16.png</file>
-    <file>align-center.32.png</file>
-    <file>align-center.64.png</file>
-    <file>align-center.128.png</file>
-    <file>align-left.16.png</file>
-    <file>align-left.32.png</file>
-    <file>align-left.64.png</file>
-    <file>align-left.128.png</file>
-    <file>align-right.16.png</file>
-    <file>align-right.32.png</file>
-    <file>align-right.64.png</file>
-    <file>align-right.128.png</file>
-    <file>arrow.16.png</file>
-    <file>arrow.32.png</file>
-    <file>arrow.64.png</file>
-    <file>arrow.128.png</file>
-    <file>audiosource.16.png</file>
-    <file>audiosource.32.png</file>
-    <file>audiosource.64.png</file>
-    <file>audiosource.128.png</file>
-    <file>beam.16.png</file>
-    <file>beam.32.png</file>
-    <file>beam.64.png</file>
-    <file>beam.128.png</file>
-    <file>clock.16.png</file>
-    <file>clock.32.png</file>
-    <file>clock.64.png</file>
-    <file>clock.128.png</file>
-    <file>diamond.16.png</file>
-    <file>diamond.32.png</file>
-    <file>diamond.64.png</file>
-    <file>diamond.128.png</file>
-    <file>dirup.16.png</file>
-    <file>dirup.32.png</file>
-    <file>dirup.64.png</file>
-    <file>dirup.128.png</file>
-    <file>error.16.png</file>
-    <file>error.32.png</file>
-    <file>error.64.png</file>
-    <file>error.128.png</file>
-    <file>ff.16.png</file>
-    <file>ff.32.png</file>
-    <file>ff.64.png</file>
-    <file>ff.128.png</file>
-    <file>folder.16.png</file>
-    <file>folder.32.png</file>
-    <file>folder.64.png</file>
-    <file>folder.128.png</file>
-    <file>hand.16.png</file>
-    <file>hand.32.png</file>
-    <file>hand.64.png</file>
-    <file>hand.128.png</file>
-    <file>iconview.16.png</file>
-    <file>iconview.32.png</file>
-    <file>iconview.64.png</file>
-    <file>iconview.128.png</file>
-    <file>imagesource.16.png</file>
-    <file>imagesource.32.png</file>
-    <file>imagesource.64.png</file>
-    <file>imagesource.128.png</file>
-    <file>italic.16.png</file>
-    <file>italic.32.png</file>
-    <file>italic.64.png</file>
-    <file>italic.128.png</file>
-    <file>justify-center.16.png</file>
-    <file>justify-center.32.png</file>
-    <file>justify-center.64.png</file>
-    <file>justify-center.128.png</file>
-    <file>listview.16.png</file>
-    <file>listview.32.png</file>
-    <file>listview.64.png</file>
-    <file>listview.128.png</file>
-    <file>magnet.16.png</file>
-    <file>magnet.32.png</file>
-    <file>magnet.64.png</file>
-    <file>magnet.128.png</file>
-    <file>new.16.png</file>
-    <file>new.32.png</file>
-    <file>new.64.png</file>
-    <file>new.128.png</file>
-    <file>next.16.png</file>
-    <file>next.32.png</file>
-    <file>next.64.png</file>
-    <file>next.128.png</file>
-    <file>open.16.png</file>
-    <file>open.32.png</file>
-    <file>open.64.png</file>
-    <file>open.128.png</file>
-    <file>pause.16.png</file>
-    <file>pause.32.png</file>
-    <file>pause.64.png</file>
-    <file>pause.128.png</file>
-    <file>play.16.png</file>
-    <file>play.32.png</file>
-    <file>play.64.png</file>
-    <file>play.128.png</file>
-    <file>prev.16.png</file>
-    <file>prev.32.png</file>
-    <file>prev.64.png</file>
-    <file>prev.128.png</file>
-    <file>razor.16.png</file>
-    <file>razor.32.png</file>
-    <file>razor.64.png</file>
-    <file>razor.128.png</file>
-    <file>record.16.png</file>
-    <file>record.32.png</file>
-    <file>record.64.png</file>
-    <file>record.128.png</file>
-    <file>redo.16.png</file>
-    <file>redo.32.png</file>
-    <file>redo.64.png</file>
-    <file>redo.128.png</file>
-    <file>rew.16.png</file>
-    <file>rew.32.png</file>
-    <file>rew.64.png</file>
-    <file>rew.128.png</file>
-    <file>ripple.16.png</file>
-    <file>ripple.32.png</file>
-    <file>ripple.64.png</file>
-    <file>ripple.128.png</file>
-    <file>rolling.16.png</file>
-    <file>rolling.32.png</file>
-    <file>rolling.64.png</file>
-    <file>rolling.128.png</file>
-    <file>save.16.png</file>
-    <file>save.32.png</file>
-    <file>save.64.png</file>
-    <file>save.128.png</file>
-    <file>sequence.16.png</file>
-    <file>sequence.32.png</file>
-    <file>sequence.64.png</file>
-    <file>sequence.128.png</file>
-    <file>slide.16.png</file>
-    <file>slide.32.png</file>
-    <file>slide.64.png</file>
-    <file>slide.128.png</file>
-    <file>slip.16.png</file>
-    <file>slip.32.png</file>
-    <file>slip.64.png</file>
-    <file>slip.128.png</file>
-    <file>transition-tool.16.png</file>
-    <file>transition-tool.32.png</file>
-    <file>transition-tool.64.png</file>
-    <file>transition-tool.128.png</file>
-    <file>treeview.16.png</file>
-    <file>treeview.32.png</file>
-    <file>treeview.64.png</file>
-    <file>treeview.128.png</file>
-    <file>tri-down.16.png</file>
-    <file>tri-down.32.png</file>
-    <file>tri-down.64.png</file>
-    <file>tri-down.128.png</file>
-    <file>tri-left.16.png</file>
-    <file>tri-left.32.png</file>
-    <file>tri-left.64.png</file>
-    <file>tri-left.128.png</file>
-    <file>tri-right.16.png</file>
-    <file>tri-right.32.png</file>
-    <file>tri-right.64.png</file>
-    <file>tri-right.128.png</file>
-    <file>tri-up.16.png</file>
-    <file>tri-up.32.png</file>
-    <file>tri-up.64.png</file>
-    <file>tri-up.128.png</file>
-    <file>underline.16.png</file>
-    <file>underline.32.png</file>
-    <file>underline.64.png</file>
-    <file>underline.128.png</file>
-    <file>undo.16.png</file>
-    <file>undo.32.png</file>
-    <file>undo.64.png</file>
-    <file>undo.128.png</file>
-    <file>videosource.16.png</file>
-    <file>videosource.32.png</file>
-    <file>videosource.64.png</file>
-    <file>videosource.128.png</file>
-    <file>zoomin.16.png</file>
-    <file>zoomin.32.png</file>
-    <file>zoomin.64.png</file>
-    <file>zoomin.128.png</file>
-    <file>zoomout.16.png</file>
-    <file>zoomout.32.png</file>
-    <file>zoomout.64.png</file>
-    <file>zoomout.128.png</file>
-  </qresource>
-</RCC>
diff --git a/app/ui/icons/olive-light/olive-light.qrc b/app/ui/icons/olive-light/olive-light.qrc
deleted file mode 100644
index c3f12e1c2..000000000
--- a/app/ui/icons/olive-light/olive-light.qrc
+++ /dev/null
@@ -1,200 +0,0 @@
-<RCC>
-  <qresource prefix="/icons/olive-light">
-    <file>add-button.16.png</file>
-    <file>add-button.32.png</file>
-    <file>add-button.64.png</file>
-    <file>add-button.128.png</file>
-    <file>add-effect.16.png</file>
-    <file>add-effect.32.png</file>
-    <file>add-effect.64.png</file>
-    <file>add-effect.128.png</file>
-    <file>add-transition.16.png</file>
-    <file>add-transition.32.png</file>
-    <file>add-transition.64.png</file>
-    <file>add-transition.128.png</file>
-    <file>align-center.16.png</file>
-    <file>align-center.32.png</file>
-    <file>align-center.64.png</file>
-    <file>align-center.128.png</file>
-    <file>align-left.16.png</file>
-    <file>align-left.32.png</file>
-    <file>align-left.64.png</file>
-    <file>align-left.128.png</file>
-    <file>align-right.16.png</file>
-    <file>align-right.32.png</file>
-    <file>align-right.64.png</file>
-    <file>align-right.128.png</file>
-    <file>arrow.16.png</file>
-    <file>arrow.32.png</file>
-    <file>arrow.64.png</file>
-    <file>arrow.128.png</file>
-    <file>audiosource.16.png</file>
-    <file>audiosource.32.png</file>
-    <file>audiosource.64.png</file>
-    <file>audiosource.128.png</file>
-    <file>beam.16.png</file>
-    <file>beam.32.png</file>
-    <file>beam.64.png</file>
-    <file>beam.128.png</file>
-    <file>clock.16.png</file>
-    <file>clock.32.png</file>
-    <file>clock.64.png</file>
-    <file>clock.128.png</file>
-    <file>diamond.16.png</file>
-    <file>diamond.32.png</file>
-    <file>diamond.64.png</file>
-    <file>diamond.128.png</file>
-    <file>dirup.16.png</file>
-    <file>dirup.32.png</file>
-    <file>dirup.64.png</file>
-    <file>dirup.128.png</file>
-    <file>error.16.png</file>
-    <file>error.32.png</file>
-    <file>error.64.png</file>
-    <file>error.128.png</file>
-    <file>ff.16.png</file>
-    <file>ff.32.png</file>
-    <file>ff.64.png</file>
-    <file>ff.128.png</file>
-    <file>folder.16.png</file>
-    <file>folder.32.png</file>
-    <file>folder.64.png</file>
-    <file>folder.128.png</file>
-    <file>hand.16.png</file>
-    <file>hand.32.png</file>
-    <file>hand.64.png</file>
-    <file>hand.128.png</file>
-    <file>iconview.16.png</file>
-    <file>iconview.32.png</file>
-    <file>iconview.64.png</file>
-    <file>iconview.128.png</file>
-    <file>imagesource.16.png</file>
-    <file>imagesource.32.png</file>
-    <file>imagesource.64.png</file>
-    <file>imagesource.128.png</file>
-    <file>italic.16.png</file>
-    <file>italic.32.png</file>
-    <file>italic.64.png</file>
-    <file>italic.128.png</file>
-    <file>justify-center.16.png</file>
-    <file>justify-center.32.png</file>
-    <file>justify-center.64.png</file>
-    <file>justify-center.128.png</file>
-    <file>listview.16.png</file>
-    <file>listview.32.png</file>
-    <file>listview.64.png</file>
-    <file>listview.128.png</file>
-    <file>magnet.16.png</file>
-    <file>magnet.32.png</file>
-    <file>magnet.64.png</file>
-    <file>magnet.128.png</file>
-    <file>new.16.png</file>
-    <file>new.32.png</file>
-    <file>new.64.png</file>
-    <file>new.128.png</file>
-    <file>next.16.png</file>
-    <file>next.32.png</file>
-    <file>next.64.png</file>
-    <file>next.128.png</file>
-    <file>open.16.png</file>
-    <file>open.32.png</file>
-    <file>open.64.png</file>
-    <file>open.128.png</file>
-    <file>pause.16.png</file>
-    <file>pause.32.png</file>
-    <file>pause.64.png</file>
-    <file>pause.128.png</file>
-    <file>play.16.png</file>
-    <file>play.32.png</file>
-    <file>play.64.png</file>
-    <file>play.128.png</file>
-    <file>prev.16.png</file>
-    <file>prev.32.png</file>
-    <file>prev.64.png</file>
-    <file>prev.128.png</file>
-    <file>razor.16.png</file>
-    <file>razor.32.png</file>
-    <file>razor.64.png</file>
-    <file>razor.128.png</file>
-    <file>record.16.png</file>
-    <file>record.32.png</file>
-    <file>record.64.png</file>
-    <file>record.128.png</file>
-    <file>redo.16.png</file>
-    <file>redo.32.png</file>
-    <file>redo.64.png</file>
-    <file>redo.128.png</file>
-    <file>rew.16.png</file>
-    <file>rew.32.png</file>
-    <file>rew.64.png</file>
-    <file>rew.128.png</file>
-    <file>ripple.16.png</file>
-    <file>ripple.32.png</file>
-    <file>ripple.64.png</file>
-    <file>ripple.128.png</file>
-    <file>rolling.16.png</file>
-    <file>rolling.32.png</file>
-    <file>rolling.64.png</file>
-    <file>rolling.128.png</file>
-    <file>save.16.png</file>
-    <file>save.32.png</file>
-    <file>save.64.png</file>
-    <file>save.128.png</file>
-    <file>sequence.16.png</file>
-    <file>sequence.32.png</file>
-    <file>sequence.64.png</file>
-    <file>sequence.128.png</file>
-    <file>slide.16.png</file>
-    <file>slide.32.png</file>
-    <file>slide.64.png</file>
-    <file>slide.128.png</file>
-    <file>slip.16.png</file>
-    <file>slip.32.png</file>
-    <file>slip.64.png</file>
-    <file>slip.128.png</file>
-    <file>transition-tool.16.png</file>
-    <file>transition-tool.32.png</file>
-    <file>transition-tool.64.png</file>
-    <file>transition-tool.128.png</file>
-    <file>treeview.16.png</file>
-    <file>treeview.32.png</file>
-    <file>treeview.64.png</file>
-    <file>treeview.128.png</file>
-    <file>tri-down.16.png</file>
-    <file>tri-down.32.png</file>
-    <file>tri-down.64.png</file>
-    <file>tri-down.128.png</file>
-    <file>tri-left.16.png</file>
-    <file>tri-left.32.png</file>
-    <file>tri-left.64.png</file>
-    <file>tri-left.128.png</file>
-    <file>tri-right.16.png</file>
-    <file>tri-right.32.png</file>
-    <file>tri-right.64.png</file>
-    <file>tri-right.128.png</file>
-    <file>tri-up.16.png</file>
-    <file>tri-up.32.png</file>
-    <file>tri-up.64.png</file>
-    <file>tri-up.128.png</file>
-    <file>underline.16.png</file>
-    <file>underline.32.png</file>
-    <file>underline.64.png</file>
-    <file>underline.128.png</file>
-    <file>undo.16.png</file>
-    <file>undo.32.png</file>
-    <file>undo.64.png</file>
-    <file>undo.128.png</file>
-    <file>videosource.16.png</file>
-    <file>videosource.32.png</file>
-    <file>videosource.64.png</file>
-    <file>videosource.128.png</file>
-    <file>zoomin.16.png</file>
-    <file>zoomin.32.png</file>
-    <file>zoomin.64.png</file>
-    <file>zoomin.128.png</file>
-    <file>zoomout.16.png</file>
-    <file>zoomout.32.png</file>
-    <file>zoomout.64.png</file>
-    <file>zoomout.128.png</file>
-  </qresource>
-</RCC>
diff --git a/app/ui/style/CMakeLists.txt b/app/ui/style/CMakeLists.txt
index 2e8776964..179a50687 100644
--- a/app/ui/style/CMakeLists.txt
+++ b/app/ui/style/CMakeLists.txt
@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(css)
-
 set(OLIVE_RESOURCES
   ${OLIVE_RESOURCES}
+  ui/style/olive-light/olive-light.qrc
+  ui/style/olive-dark/olive-dark.qrc
   PARENT_SCOPE
 )
 
diff --git a/app/ui/style/HOWTO.md b/app/ui/style/HOWTO.md
new file mode 100644
index 000000000..be26fa5d2
--- /dev/null
+++ b/app/ui/style/HOWTO.md
@@ -0,0 +1,13 @@
+# How to create an Olive style
+
+Olive supports customization of its interface through CSS (Qt CSS) and icon replacements.
+
+To create a style, you'll need to create a CSS file called `style.css` and SVG icons. Feel free to duplicate an existing
+theme for reference.
+
+To save performance, Olive doesn't actually use the SVGs directly and will need them to be converted to multiple-size
+PNGs. You don't need to worry about this step though, `generate-style.sh` will do this for you automatically. You'll
+need to re-run this script any time you change an SVG to update the PNG.
+
+For internal use, `generate-style.sh` will also create a QRC so the style can be compiled into Olive. You'll need to
+manually add the QRC to `ui/style/CMakeLists.txt` though.
\ No newline at end of file
diff --git a/app/ui/style/css/CMakeLists.txt b/app/ui/style/css/CMakeLists.txt
deleted file mode 100644
index 3359b5512..000000000
--- a/app/ui/style/css/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Olive - Non-Linear Video Editor
-# Copyright (C) 2019 Olive Team
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set(OLIVE_RESOURCES
-  ${OLIVE_RESOURCES}
-  ui/style/css/stylesheets.qrc
-  PARENT_SCOPE
-)
diff --git a/app/ui/style/css/stylesheets.qrc b/app/ui/style/css/stylesheets.qrc
deleted file mode 100644
index 724e6cc14..000000000
--- a/app/ui/style/css/stylesheets.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-  <qresource prefix="/css">
-    <file>olive-dark.css</file>
-    <file>olive-light.css</file>
-  </qresource>
-</RCC>
diff --git a/app/ui/icons/generate-icons.sh b/app/ui/style/generate-style.sh
similarity index 90%
rename from app/ui/icons/generate-icons.sh
rename to app/ui/style/generate-style.sh
index d5246d84e..21192314e 100755
--- a/app/ui/icons/generate-icons.sh
+++ b/app/ui/style/generate-style.sh
@@ -43,9 +43,11 @@ fi
 
 PACKNAME=$1
 SVGDIR=$1/svg
-PNGDIR=$1
+PNGDIR=$1/png
 QRCFILE=$1/$1.qrc
 
+mkdir -p $PNGDIR
+
 ONLYQRC=0
 
 if [ "$2" == "-n" ]
@@ -56,12 +58,13 @@ fi
 truncate -s 0 $QRCFILE
 
 echo "<RCC>" >> $QRCFILE
-echo "  <qresource prefix=\"/icons/$PACKNAME\">" >> $QRCFILE
+echo "  <qresource prefix=\"/style/$PACKNAME\">" >> $QRCFILE
+echo "    <file>style.css</file>" >> $QRCFILE
 
 OutputPng() {
   echo Creating $2...
 
-  echo "    <file>$(basename $2)</file>" >> $QRCFILE
+  echo "    <file>png/$(basename $2)</file>" >> $QRCFILE
 
   if [ $ONLYQRC -eq 0 ]
   then
diff --git a/app/ui/style/olive-dark/olive-dark.qrc b/app/ui/style/olive-dark/olive-dark.qrc
new file mode 100644
index 000000000..5f620ebd9
--- /dev/null
+++ b/app/ui/style/olive-dark/olive-dark.qrc
@@ -0,0 +1,201 @@
+<RCC>
+  <qresource prefix="/style/olive-dark">
+    <file>style.css</file>
+    <file>png/add-button.16.png</file>
+    <file>png/add-button.32.png</file>
+    <file>png/add-button.64.png</file>
+    <file>png/add-button.128.png</file>
+    <file>png/add-effect.16.png</file>
+    <file>png/add-effect.32.png</file>
+    <file>png/add-effect.64.png</file>
+    <file>png/add-effect.128.png</file>
+    <file>png/add-transition.16.png</file>
+    <file>png/add-transition.32.png</file>
+    <file>png/add-transition.64.png</file>
+    <file>png/add-transition.128.png</file>
+    <file>png/align-center.16.png</file>
+    <file>png/align-center.32.png</file>
+    <file>png/align-center.64.png</file>
+    <file>png/align-center.128.png</file>
+    <file>png/align-left.16.png</file>
+    <file>png/align-left.32.png</file>
+    <file>png/align-left.64.png</file>
+    <file>png/align-left.128.png</file>
+    <file>png/align-right.16.png</file>
+    <file>png/align-right.32.png</file>
+    <file>png/align-right.64.png</file>
+    <file>png/align-right.128.png</file>
+    <file>png/arrow.16.png</file>
+    <file>png/arrow.32.png</file>
+    <file>png/arrow.64.png</file>
+    <file>png/arrow.128.png</file>
+    <file>png/audiosource.16.png</file>
+    <file>png/audiosource.32.png</file>
+    <file>png/audiosource.64.png</file>
+    <file>png/audiosource.128.png</file>
+    <file>png/beam.16.png</file>
+    <file>png/beam.32.png</file>
+    <file>png/beam.64.png</file>
+    <file>png/beam.128.png</file>
+    <file>png/clock.16.png</file>
+    <file>png/clock.32.png</file>
+    <file>png/clock.64.png</file>
+    <file>png/clock.128.png</file>
+    <file>png/diamond.16.png</file>
+    <file>png/diamond.32.png</file>
+    <file>png/diamond.64.png</file>
+    <file>png/diamond.128.png</file>
+    <file>png/dirup.16.png</file>
+    <file>png/dirup.32.png</file>
+    <file>png/dirup.64.png</file>
+    <file>png/dirup.128.png</file>
+    <file>png/error.16.png</file>
+    <file>png/error.32.png</file>
+    <file>png/error.64.png</file>
+    <file>png/error.128.png</file>
+    <file>png/ff.16.png</file>
+    <file>png/ff.32.png</file>
+    <file>png/ff.64.png</file>
+    <file>png/ff.128.png</file>
+    <file>png/folder.16.png</file>
+    <file>png/folder.32.png</file>
+    <file>png/folder.64.png</file>
+    <file>png/folder.128.png</file>
+    <file>png/hand.16.png</file>
+    <file>png/hand.32.png</file>
+    <file>png/hand.64.png</file>
+    <file>png/hand.128.png</file>
+    <file>png/iconview.16.png</file>
+    <file>png/iconview.32.png</file>
+    <file>png/iconview.64.png</file>
+    <file>png/iconview.128.png</file>
+    <file>png/imagesource.16.png</file>
+    <file>png/imagesource.32.png</file>
+    <file>png/imagesource.64.png</file>
+    <file>png/imagesource.128.png</file>
+    <file>png/italic.16.png</file>
+    <file>png/italic.32.png</file>
+    <file>png/italic.64.png</file>
+    <file>png/italic.128.png</file>
+    <file>png/justify-center.16.png</file>
+    <file>png/justify-center.32.png</file>
+    <file>png/justify-center.64.png</file>
+    <file>png/justify-center.128.png</file>
+    <file>png/listview.16.png</file>
+    <file>png/listview.32.png</file>
+    <file>png/listview.64.png</file>
+    <file>png/listview.128.png</file>
+    <file>png/magnet.16.png</file>
+    <file>png/magnet.32.png</file>
+    <file>png/magnet.64.png</file>
+    <file>png/magnet.128.png</file>
+    <file>png/new.16.png</file>
+    <file>png/new.32.png</file>
+    <file>png/new.64.png</file>
+    <file>png/new.128.png</file>
+    <file>png/next.16.png</file>
+    <file>png/next.32.png</file>
+    <file>png/next.64.png</file>
+    <file>png/next.128.png</file>
+    <file>png/open.16.png</file>
+    <file>png/open.32.png</file>
+    <file>png/open.64.png</file>
+    <file>png/open.128.png</file>
+    <file>png/pause.16.png</file>
+    <file>png/pause.32.png</file>
+    <file>png/pause.64.png</file>
+    <file>png/pause.128.png</file>
+    <file>png/play.16.png</file>
+    <file>png/play.32.png</file>
+    <file>png/play.64.png</file>
+    <file>png/play.128.png</file>
+    <file>png/prev.16.png</file>
+    <file>png/prev.32.png</file>
+    <file>png/prev.64.png</file>
+    <file>png/prev.128.png</file>
+    <file>png/razor.16.png</file>
+    <file>png/razor.32.png</file>
+    <file>png/razor.64.png</file>
+    <file>png/razor.128.png</file>
+    <file>png/record.16.png</file>
+    <file>png/record.32.png</file>
+    <file>png/record.64.png</file>
+    <file>png/record.128.png</file>
+    <file>png/redo.16.png</file>
+    <file>png/redo.32.png</file>
+    <file>png/redo.64.png</file>
+    <file>png/redo.128.png</file>
+    <file>png/rew.16.png</file>
+    <file>png/rew.32.png</file>
+    <file>png/rew.64.png</file>
+    <file>png/rew.128.png</file>
+    <file>png/ripple.16.png</file>
+    <file>png/ripple.32.png</file>
+    <file>png/ripple.64.png</file>
+    <file>png/ripple.128.png</file>
+    <file>png/rolling.16.png</file>
+    <file>png/rolling.32.png</file>
+    <file>png/rolling.64.png</file>
+    <file>png/rolling.128.png</file>
+    <file>png/save.16.png</file>
+    <file>png/save.32.png</file>
+    <file>png/save.64.png</file>
+    <file>png/save.128.png</file>
+    <file>png/sequence.16.png</file>
+    <file>png/sequence.32.png</file>
+    <file>png/sequence.64.png</file>
+    <file>png/sequence.128.png</file>
+    <file>png/slide.16.png</file>
+    <file>png/slide.32.png</file>
+    <file>png/slide.64.png</file>
+    <file>png/slide.128.png</file>
+    <file>png/slip.16.png</file>
+    <file>png/slip.32.png</file>
+    <file>png/slip.64.png</file>
+    <file>png/slip.128.png</file>
+    <file>png/transition-tool.16.png</file>
+    <file>png/transition-tool.32.png</file>
+    <file>png/transition-tool.64.png</file>
+    <file>png/transition-tool.128.png</file>
+    <file>png/treeview.16.png</file>
+    <file>png/treeview.32.png</file>
+    <file>png/treeview.64.png</file>
+    <file>png/treeview.128.png</file>
+    <file>png/tri-down.16.png</file>
+    <file>png/tri-down.32.png</file>
+    <file>png/tri-down.64.png</file>
+    <file>png/tri-down.128.png</file>
+    <file>png/tri-left.16.png</file>
+    <file>png/tri-left.32.png</file>
+    <file>png/tri-left.64.png</file>
+    <file>png/tri-left.128.png</file>
+    <file>png/tri-right.16.png</file>
+    <file>png/tri-right.32.png</file>
+    <file>png/tri-right.64.png</file>
+    <file>png/tri-right.128.png</file>
+    <file>png/tri-up.16.png</file>
+    <file>png/tri-up.32.png</file>
+    <file>png/tri-up.64.png</file>
+    <file>png/tri-up.128.png</file>
+    <file>png/underline.16.png</file>
+    <file>png/underline.32.png</file>
+    <file>png/underline.64.png</file>
+    <file>png/underline.128.png</file>
+    <file>png/undo.16.png</file>
+    <file>png/undo.32.png</file>
+    <file>png/undo.64.png</file>
+    <file>png/undo.128.png</file>
+    <file>png/videosource.16.png</file>
+    <file>png/videosource.32.png</file>
+    <file>png/videosource.64.png</file>
+    <file>png/videosource.128.png</file>
+    <file>png/zoomin.16.png</file>
+    <file>png/zoomin.32.png</file>
+    <file>png/zoomin.64.png</file>
+    <file>png/zoomin.128.png</file>
+    <file>png/zoomout.16.png</file>
+    <file>png/zoomout.32.png</file>
+    <file>png/zoomout.64.png</file>
+    <file>png/zoomout.128.png</file>
+  </qresource>
+</RCC>
diff --git a/app/ui/icons/olive-dark/add-button.128.png b/app/ui/style/olive-dark/png/add-button.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-button.128.png
rename to app/ui/style/olive-dark/png/add-button.128.png
diff --git a/app/ui/icons/olive-dark/add-button.16.png b/app/ui/style/olive-dark/png/add-button.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-button.16.png
rename to app/ui/style/olive-dark/png/add-button.16.png
diff --git a/app/ui/icons/olive-dark/add-button.32.png b/app/ui/style/olive-dark/png/add-button.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-button.32.png
rename to app/ui/style/olive-dark/png/add-button.32.png
diff --git a/app/ui/icons/olive-dark/add-button.64.png b/app/ui/style/olive-dark/png/add-button.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-button.64.png
rename to app/ui/style/olive-dark/png/add-button.64.png
diff --git a/app/ui/icons/olive-dark/add-effect.128.png b/app/ui/style/olive-dark/png/add-effect.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-effect.128.png
rename to app/ui/style/olive-dark/png/add-effect.128.png
diff --git a/app/ui/icons/olive-dark/add-effect.16.png b/app/ui/style/olive-dark/png/add-effect.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-effect.16.png
rename to app/ui/style/olive-dark/png/add-effect.16.png
diff --git a/app/ui/icons/olive-dark/add-effect.32.png b/app/ui/style/olive-dark/png/add-effect.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-effect.32.png
rename to app/ui/style/olive-dark/png/add-effect.32.png
diff --git a/app/ui/icons/olive-dark/add-effect.64.png b/app/ui/style/olive-dark/png/add-effect.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-effect.64.png
rename to app/ui/style/olive-dark/png/add-effect.64.png
diff --git a/app/ui/icons/olive-dark/add-transition.128.png b/app/ui/style/olive-dark/png/add-transition.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-transition.128.png
rename to app/ui/style/olive-dark/png/add-transition.128.png
diff --git a/app/ui/icons/olive-dark/add-transition.16.png b/app/ui/style/olive-dark/png/add-transition.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-transition.16.png
rename to app/ui/style/olive-dark/png/add-transition.16.png
diff --git a/app/ui/icons/olive-dark/add-transition.32.png b/app/ui/style/olive-dark/png/add-transition.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-transition.32.png
rename to app/ui/style/olive-dark/png/add-transition.32.png
diff --git a/app/ui/icons/olive-dark/add-transition.64.png b/app/ui/style/olive-dark/png/add-transition.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/add-transition.64.png
rename to app/ui/style/olive-dark/png/add-transition.64.png
diff --git a/app/ui/icons/olive-dark/align-center.128.png b/app/ui/style/olive-dark/png/align-center.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-center.128.png
rename to app/ui/style/olive-dark/png/align-center.128.png
diff --git a/app/ui/icons/olive-dark/align-center.16.png b/app/ui/style/olive-dark/png/align-center.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-center.16.png
rename to app/ui/style/olive-dark/png/align-center.16.png
diff --git a/app/ui/icons/olive-dark/align-center.32.png b/app/ui/style/olive-dark/png/align-center.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-center.32.png
rename to app/ui/style/olive-dark/png/align-center.32.png
diff --git a/app/ui/icons/olive-dark/align-center.64.png b/app/ui/style/olive-dark/png/align-center.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-center.64.png
rename to app/ui/style/olive-dark/png/align-center.64.png
diff --git a/app/ui/icons/olive-dark/align-left.128.png b/app/ui/style/olive-dark/png/align-left.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-left.128.png
rename to app/ui/style/olive-dark/png/align-left.128.png
diff --git a/app/ui/icons/olive-dark/align-left.16.png b/app/ui/style/olive-dark/png/align-left.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-left.16.png
rename to app/ui/style/olive-dark/png/align-left.16.png
diff --git a/app/ui/icons/olive-dark/align-left.32.png b/app/ui/style/olive-dark/png/align-left.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-left.32.png
rename to app/ui/style/olive-dark/png/align-left.32.png
diff --git a/app/ui/icons/olive-dark/align-left.64.png b/app/ui/style/olive-dark/png/align-left.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-left.64.png
rename to app/ui/style/olive-dark/png/align-left.64.png
diff --git a/app/ui/icons/olive-dark/align-right.128.png b/app/ui/style/olive-dark/png/align-right.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-right.128.png
rename to app/ui/style/olive-dark/png/align-right.128.png
diff --git a/app/ui/icons/olive-dark/align-right.16.png b/app/ui/style/olive-dark/png/align-right.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-right.16.png
rename to app/ui/style/olive-dark/png/align-right.16.png
diff --git a/app/ui/icons/olive-dark/align-right.32.png b/app/ui/style/olive-dark/png/align-right.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-right.32.png
rename to app/ui/style/olive-dark/png/align-right.32.png
diff --git a/app/ui/icons/olive-dark/align-right.64.png b/app/ui/style/olive-dark/png/align-right.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/align-right.64.png
rename to app/ui/style/olive-dark/png/align-right.64.png
diff --git a/app/ui/icons/olive-dark/arrow.128.png b/app/ui/style/olive-dark/png/arrow.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/arrow.128.png
rename to app/ui/style/olive-dark/png/arrow.128.png
diff --git a/app/ui/icons/olive-dark/arrow.16.png b/app/ui/style/olive-dark/png/arrow.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/arrow.16.png
rename to app/ui/style/olive-dark/png/arrow.16.png
diff --git a/app/ui/icons/olive-dark/arrow.32.png b/app/ui/style/olive-dark/png/arrow.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/arrow.32.png
rename to app/ui/style/olive-dark/png/arrow.32.png
diff --git a/app/ui/icons/olive-dark/arrow.64.png b/app/ui/style/olive-dark/png/arrow.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/arrow.64.png
rename to app/ui/style/olive-dark/png/arrow.64.png
diff --git a/app/ui/icons/olive-dark/audiosource.128.png b/app/ui/style/olive-dark/png/audiosource.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/audiosource.128.png
rename to app/ui/style/olive-dark/png/audiosource.128.png
diff --git a/app/ui/icons/olive-dark/audiosource.16.png b/app/ui/style/olive-dark/png/audiosource.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/audiosource.16.png
rename to app/ui/style/olive-dark/png/audiosource.16.png
diff --git a/app/ui/icons/olive-dark/audiosource.32.png b/app/ui/style/olive-dark/png/audiosource.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/audiosource.32.png
rename to app/ui/style/olive-dark/png/audiosource.32.png
diff --git a/app/ui/icons/olive-dark/audiosource.64.png b/app/ui/style/olive-dark/png/audiosource.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/audiosource.64.png
rename to app/ui/style/olive-dark/png/audiosource.64.png
diff --git a/app/ui/icons/olive-dark/beam.128.png b/app/ui/style/olive-dark/png/beam.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/beam.128.png
rename to app/ui/style/olive-dark/png/beam.128.png
diff --git a/app/ui/icons/olive-dark/beam.16.png b/app/ui/style/olive-dark/png/beam.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/beam.16.png
rename to app/ui/style/olive-dark/png/beam.16.png
diff --git a/app/ui/icons/olive-dark/beam.32.png b/app/ui/style/olive-dark/png/beam.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/beam.32.png
rename to app/ui/style/olive-dark/png/beam.32.png
diff --git a/app/ui/icons/olive-dark/beam.64.png b/app/ui/style/olive-dark/png/beam.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/beam.64.png
rename to app/ui/style/olive-dark/png/beam.64.png
diff --git a/app/ui/icons/olive-dark/clock.128.png b/app/ui/style/olive-dark/png/clock.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/clock.128.png
rename to app/ui/style/olive-dark/png/clock.128.png
diff --git a/app/ui/icons/olive-dark/clock.16.png b/app/ui/style/olive-dark/png/clock.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/clock.16.png
rename to app/ui/style/olive-dark/png/clock.16.png
diff --git a/app/ui/icons/olive-dark/clock.32.png b/app/ui/style/olive-dark/png/clock.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/clock.32.png
rename to app/ui/style/olive-dark/png/clock.32.png
diff --git a/app/ui/icons/olive-dark/clock.64.png b/app/ui/style/olive-dark/png/clock.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/clock.64.png
rename to app/ui/style/olive-dark/png/clock.64.png
diff --git a/app/ui/icons/olive-dark/diamond.128.png b/app/ui/style/olive-dark/png/diamond.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/diamond.128.png
rename to app/ui/style/olive-dark/png/diamond.128.png
diff --git a/app/ui/icons/olive-dark/diamond.16.png b/app/ui/style/olive-dark/png/diamond.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/diamond.16.png
rename to app/ui/style/olive-dark/png/diamond.16.png
diff --git a/app/ui/icons/olive-dark/diamond.32.png b/app/ui/style/olive-dark/png/diamond.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/diamond.32.png
rename to app/ui/style/olive-dark/png/diamond.32.png
diff --git a/app/ui/icons/olive-dark/diamond.64.png b/app/ui/style/olive-dark/png/diamond.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/diamond.64.png
rename to app/ui/style/olive-dark/png/diamond.64.png
diff --git a/app/ui/icons/olive-dark/dirup.128.png b/app/ui/style/olive-dark/png/dirup.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/dirup.128.png
rename to app/ui/style/olive-dark/png/dirup.128.png
diff --git a/app/ui/icons/olive-dark/dirup.16.png b/app/ui/style/olive-dark/png/dirup.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/dirup.16.png
rename to app/ui/style/olive-dark/png/dirup.16.png
diff --git a/app/ui/icons/olive-dark/dirup.32.png b/app/ui/style/olive-dark/png/dirup.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/dirup.32.png
rename to app/ui/style/olive-dark/png/dirup.32.png
diff --git a/app/ui/icons/olive-dark/dirup.64.png b/app/ui/style/olive-dark/png/dirup.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/dirup.64.png
rename to app/ui/style/olive-dark/png/dirup.64.png
diff --git a/app/ui/icons/olive-dark/error.128.png b/app/ui/style/olive-dark/png/error.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/error.128.png
rename to app/ui/style/olive-dark/png/error.128.png
diff --git a/app/ui/icons/olive-dark/error.16.png b/app/ui/style/olive-dark/png/error.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/error.16.png
rename to app/ui/style/olive-dark/png/error.16.png
diff --git a/app/ui/icons/olive-dark/error.32.png b/app/ui/style/olive-dark/png/error.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/error.32.png
rename to app/ui/style/olive-dark/png/error.32.png
diff --git a/app/ui/icons/olive-dark/error.64.png b/app/ui/style/olive-dark/png/error.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/error.64.png
rename to app/ui/style/olive-dark/png/error.64.png
diff --git a/app/ui/icons/olive-dark/ff.128.png b/app/ui/style/olive-dark/png/ff.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/ff.128.png
rename to app/ui/style/olive-dark/png/ff.128.png
diff --git a/app/ui/icons/olive-dark/ff.16.png b/app/ui/style/olive-dark/png/ff.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/ff.16.png
rename to app/ui/style/olive-dark/png/ff.16.png
diff --git a/app/ui/icons/olive-dark/ff.32.png b/app/ui/style/olive-dark/png/ff.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/ff.32.png
rename to app/ui/style/olive-dark/png/ff.32.png
diff --git a/app/ui/icons/olive-dark/ff.64.png b/app/ui/style/olive-dark/png/ff.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/ff.64.png
rename to app/ui/style/olive-dark/png/ff.64.png
diff --git a/app/ui/icons/olive-dark/folder.128.png b/app/ui/style/olive-dark/png/folder.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/folder.128.png
rename to app/ui/style/olive-dark/png/folder.128.png
diff --git a/app/ui/icons/olive-dark/folder.16.png b/app/ui/style/olive-dark/png/folder.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/folder.16.png
rename to app/ui/style/olive-dark/png/folder.16.png
diff --git a/app/ui/icons/olive-dark/folder.32.png b/app/ui/style/olive-dark/png/folder.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/folder.32.png
rename to app/ui/style/olive-dark/png/folder.32.png
diff --git a/app/ui/icons/olive-dark/folder.64.png b/app/ui/style/olive-dark/png/folder.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/folder.64.png
rename to app/ui/style/olive-dark/png/folder.64.png
diff --git a/app/ui/icons/olive-dark/hand.128.png b/app/ui/style/olive-dark/png/hand.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/hand.128.png
rename to app/ui/style/olive-dark/png/hand.128.png
diff --git a/app/ui/icons/olive-dark/hand.16.png b/app/ui/style/olive-dark/png/hand.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/hand.16.png
rename to app/ui/style/olive-dark/png/hand.16.png
diff --git a/app/ui/icons/olive-dark/hand.32.png b/app/ui/style/olive-dark/png/hand.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/hand.32.png
rename to app/ui/style/olive-dark/png/hand.32.png
diff --git a/app/ui/icons/olive-dark/hand.64.png b/app/ui/style/olive-dark/png/hand.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/hand.64.png
rename to app/ui/style/olive-dark/png/hand.64.png
diff --git a/app/ui/icons/olive-dark/iconview.128.png b/app/ui/style/olive-dark/png/iconview.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/iconview.128.png
rename to app/ui/style/olive-dark/png/iconview.128.png
diff --git a/app/ui/icons/olive-dark/iconview.16.png b/app/ui/style/olive-dark/png/iconview.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/iconview.16.png
rename to app/ui/style/olive-dark/png/iconview.16.png
diff --git a/app/ui/icons/olive-dark/iconview.32.png b/app/ui/style/olive-dark/png/iconview.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/iconview.32.png
rename to app/ui/style/olive-dark/png/iconview.32.png
diff --git a/app/ui/icons/olive-dark/iconview.64.png b/app/ui/style/olive-dark/png/iconview.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/iconview.64.png
rename to app/ui/style/olive-dark/png/iconview.64.png
diff --git a/app/ui/icons/olive-dark/imagesource.128.png b/app/ui/style/olive-dark/png/imagesource.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/imagesource.128.png
rename to app/ui/style/olive-dark/png/imagesource.128.png
diff --git a/app/ui/icons/olive-dark/imagesource.16.png b/app/ui/style/olive-dark/png/imagesource.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/imagesource.16.png
rename to app/ui/style/olive-dark/png/imagesource.16.png
diff --git a/app/ui/icons/olive-dark/imagesource.32.png b/app/ui/style/olive-dark/png/imagesource.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/imagesource.32.png
rename to app/ui/style/olive-dark/png/imagesource.32.png
diff --git a/app/ui/icons/olive-dark/imagesource.64.png b/app/ui/style/olive-dark/png/imagesource.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/imagesource.64.png
rename to app/ui/style/olive-dark/png/imagesource.64.png
diff --git a/app/ui/icons/olive-dark/italic.128.png b/app/ui/style/olive-dark/png/italic.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/italic.128.png
rename to app/ui/style/olive-dark/png/italic.128.png
diff --git a/app/ui/icons/olive-dark/italic.16.png b/app/ui/style/olive-dark/png/italic.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/italic.16.png
rename to app/ui/style/olive-dark/png/italic.16.png
diff --git a/app/ui/icons/olive-dark/italic.32.png b/app/ui/style/olive-dark/png/italic.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/italic.32.png
rename to app/ui/style/olive-dark/png/italic.32.png
diff --git a/app/ui/icons/olive-dark/italic.64.png b/app/ui/style/olive-dark/png/italic.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/italic.64.png
rename to app/ui/style/olive-dark/png/italic.64.png
diff --git a/app/ui/icons/olive-dark/justify-center.128.png b/app/ui/style/olive-dark/png/justify-center.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/justify-center.128.png
rename to app/ui/style/olive-dark/png/justify-center.128.png
diff --git a/app/ui/icons/olive-dark/justify-center.16.png b/app/ui/style/olive-dark/png/justify-center.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/justify-center.16.png
rename to app/ui/style/olive-dark/png/justify-center.16.png
diff --git a/app/ui/icons/olive-dark/justify-center.32.png b/app/ui/style/olive-dark/png/justify-center.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/justify-center.32.png
rename to app/ui/style/olive-dark/png/justify-center.32.png
diff --git a/app/ui/icons/olive-dark/justify-center.64.png b/app/ui/style/olive-dark/png/justify-center.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/justify-center.64.png
rename to app/ui/style/olive-dark/png/justify-center.64.png
diff --git a/app/ui/icons/olive-dark/listview.128.png b/app/ui/style/olive-dark/png/listview.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/listview.128.png
rename to app/ui/style/olive-dark/png/listview.128.png
diff --git a/app/ui/icons/olive-dark/listview.16.png b/app/ui/style/olive-dark/png/listview.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/listview.16.png
rename to app/ui/style/olive-dark/png/listview.16.png
diff --git a/app/ui/icons/olive-dark/listview.32.png b/app/ui/style/olive-dark/png/listview.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/listview.32.png
rename to app/ui/style/olive-dark/png/listview.32.png
diff --git a/app/ui/icons/olive-dark/listview.64.png b/app/ui/style/olive-dark/png/listview.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/listview.64.png
rename to app/ui/style/olive-dark/png/listview.64.png
diff --git a/app/ui/icons/olive-dark/magnet.128.png b/app/ui/style/olive-dark/png/magnet.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/magnet.128.png
rename to app/ui/style/olive-dark/png/magnet.128.png
diff --git a/app/ui/icons/olive-dark/magnet.16.png b/app/ui/style/olive-dark/png/magnet.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/magnet.16.png
rename to app/ui/style/olive-dark/png/magnet.16.png
diff --git a/app/ui/icons/olive-dark/magnet.32.png b/app/ui/style/olive-dark/png/magnet.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/magnet.32.png
rename to app/ui/style/olive-dark/png/magnet.32.png
diff --git a/app/ui/icons/olive-dark/magnet.64.png b/app/ui/style/olive-dark/png/magnet.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/magnet.64.png
rename to app/ui/style/olive-dark/png/magnet.64.png
diff --git a/app/ui/icons/olive-dark/new.128.png b/app/ui/style/olive-dark/png/new.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/new.128.png
rename to app/ui/style/olive-dark/png/new.128.png
diff --git a/app/ui/icons/olive-dark/new.16.png b/app/ui/style/olive-dark/png/new.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/new.16.png
rename to app/ui/style/olive-dark/png/new.16.png
diff --git a/app/ui/icons/olive-dark/new.32.png b/app/ui/style/olive-dark/png/new.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/new.32.png
rename to app/ui/style/olive-dark/png/new.32.png
diff --git a/app/ui/icons/olive-dark/new.64.png b/app/ui/style/olive-dark/png/new.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/new.64.png
rename to app/ui/style/olive-dark/png/new.64.png
diff --git a/app/ui/icons/olive-dark/next.128.png b/app/ui/style/olive-dark/png/next.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/next.128.png
rename to app/ui/style/olive-dark/png/next.128.png
diff --git a/app/ui/icons/olive-dark/next.16.png b/app/ui/style/olive-dark/png/next.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/next.16.png
rename to app/ui/style/olive-dark/png/next.16.png
diff --git a/app/ui/icons/olive-dark/next.32.png b/app/ui/style/olive-dark/png/next.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/next.32.png
rename to app/ui/style/olive-dark/png/next.32.png
diff --git a/app/ui/icons/olive-dark/next.64.png b/app/ui/style/olive-dark/png/next.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/next.64.png
rename to app/ui/style/olive-dark/png/next.64.png
diff --git a/app/ui/icons/olive-dark/open.128.png b/app/ui/style/olive-dark/png/open.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/open.128.png
rename to app/ui/style/olive-dark/png/open.128.png
diff --git a/app/ui/icons/olive-dark/open.16.png b/app/ui/style/olive-dark/png/open.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/open.16.png
rename to app/ui/style/olive-dark/png/open.16.png
diff --git a/app/ui/icons/olive-dark/open.32.png b/app/ui/style/olive-dark/png/open.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/open.32.png
rename to app/ui/style/olive-dark/png/open.32.png
diff --git a/app/ui/icons/olive-dark/open.64.png b/app/ui/style/olive-dark/png/open.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/open.64.png
rename to app/ui/style/olive-dark/png/open.64.png
diff --git a/app/ui/icons/olive-dark/pause.128.png b/app/ui/style/olive-dark/png/pause.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/pause.128.png
rename to app/ui/style/olive-dark/png/pause.128.png
diff --git a/app/ui/icons/olive-dark/pause.16.png b/app/ui/style/olive-dark/png/pause.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/pause.16.png
rename to app/ui/style/olive-dark/png/pause.16.png
diff --git a/app/ui/icons/olive-dark/pause.32.png b/app/ui/style/olive-dark/png/pause.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/pause.32.png
rename to app/ui/style/olive-dark/png/pause.32.png
diff --git a/app/ui/icons/olive-dark/pause.64.png b/app/ui/style/olive-dark/png/pause.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/pause.64.png
rename to app/ui/style/olive-dark/png/pause.64.png
diff --git a/app/ui/icons/olive-dark/play.128.png b/app/ui/style/olive-dark/png/play.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/play.128.png
rename to app/ui/style/olive-dark/png/play.128.png
diff --git a/app/ui/icons/olive-dark/play.16.png b/app/ui/style/olive-dark/png/play.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/play.16.png
rename to app/ui/style/olive-dark/png/play.16.png
diff --git a/app/ui/icons/olive-dark/play.32.png b/app/ui/style/olive-dark/png/play.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/play.32.png
rename to app/ui/style/olive-dark/png/play.32.png
diff --git a/app/ui/icons/olive-dark/play.64.png b/app/ui/style/olive-dark/png/play.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/play.64.png
rename to app/ui/style/olive-dark/png/play.64.png
diff --git a/app/ui/icons/olive-dark/prev.128.png b/app/ui/style/olive-dark/png/prev.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/prev.128.png
rename to app/ui/style/olive-dark/png/prev.128.png
diff --git a/app/ui/icons/olive-dark/prev.16.png b/app/ui/style/olive-dark/png/prev.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/prev.16.png
rename to app/ui/style/olive-dark/png/prev.16.png
diff --git a/app/ui/icons/olive-dark/prev.32.png b/app/ui/style/olive-dark/png/prev.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/prev.32.png
rename to app/ui/style/olive-dark/png/prev.32.png
diff --git a/app/ui/icons/olive-dark/prev.64.png b/app/ui/style/olive-dark/png/prev.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/prev.64.png
rename to app/ui/style/olive-dark/png/prev.64.png
diff --git a/app/ui/icons/olive-dark/razor.128.png b/app/ui/style/olive-dark/png/razor.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/razor.128.png
rename to app/ui/style/olive-dark/png/razor.128.png
diff --git a/app/ui/icons/olive-dark/razor.16.png b/app/ui/style/olive-dark/png/razor.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/razor.16.png
rename to app/ui/style/olive-dark/png/razor.16.png
diff --git a/app/ui/icons/olive-dark/razor.32.png b/app/ui/style/olive-dark/png/razor.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/razor.32.png
rename to app/ui/style/olive-dark/png/razor.32.png
diff --git a/app/ui/icons/olive-dark/razor.64.png b/app/ui/style/olive-dark/png/razor.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/razor.64.png
rename to app/ui/style/olive-dark/png/razor.64.png
diff --git a/app/ui/icons/olive-dark/record.128.png b/app/ui/style/olive-dark/png/record.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/record.128.png
rename to app/ui/style/olive-dark/png/record.128.png
diff --git a/app/ui/icons/olive-dark/record.16.png b/app/ui/style/olive-dark/png/record.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/record.16.png
rename to app/ui/style/olive-dark/png/record.16.png
diff --git a/app/ui/icons/olive-dark/record.32.png b/app/ui/style/olive-dark/png/record.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/record.32.png
rename to app/ui/style/olive-dark/png/record.32.png
diff --git a/app/ui/icons/olive-dark/record.64.png b/app/ui/style/olive-dark/png/record.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/record.64.png
rename to app/ui/style/olive-dark/png/record.64.png
diff --git a/app/ui/icons/olive-dark/redo.128.png b/app/ui/style/olive-dark/png/redo.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/redo.128.png
rename to app/ui/style/olive-dark/png/redo.128.png
diff --git a/app/ui/icons/olive-dark/redo.16.png b/app/ui/style/olive-dark/png/redo.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/redo.16.png
rename to app/ui/style/olive-dark/png/redo.16.png
diff --git a/app/ui/icons/olive-dark/redo.32.png b/app/ui/style/olive-dark/png/redo.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/redo.32.png
rename to app/ui/style/olive-dark/png/redo.32.png
diff --git a/app/ui/icons/olive-dark/redo.64.png b/app/ui/style/olive-dark/png/redo.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/redo.64.png
rename to app/ui/style/olive-dark/png/redo.64.png
diff --git a/app/ui/icons/olive-dark/rew.128.png b/app/ui/style/olive-dark/png/rew.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/rew.128.png
rename to app/ui/style/olive-dark/png/rew.128.png
diff --git a/app/ui/icons/olive-dark/rew.16.png b/app/ui/style/olive-dark/png/rew.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/rew.16.png
rename to app/ui/style/olive-dark/png/rew.16.png
diff --git a/app/ui/icons/olive-dark/rew.32.png b/app/ui/style/olive-dark/png/rew.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/rew.32.png
rename to app/ui/style/olive-dark/png/rew.32.png
diff --git a/app/ui/icons/olive-dark/rew.64.png b/app/ui/style/olive-dark/png/rew.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/rew.64.png
rename to app/ui/style/olive-dark/png/rew.64.png
diff --git a/app/ui/icons/olive-dark/ripple.128.png b/app/ui/style/olive-dark/png/ripple.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/ripple.128.png
rename to app/ui/style/olive-dark/png/ripple.128.png
diff --git a/app/ui/icons/olive-dark/ripple.16.png b/app/ui/style/olive-dark/png/ripple.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/ripple.16.png
rename to app/ui/style/olive-dark/png/ripple.16.png
diff --git a/app/ui/icons/olive-dark/ripple.32.png b/app/ui/style/olive-dark/png/ripple.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/ripple.32.png
rename to app/ui/style/olive-dark/png/ripple.32.png
diff --git a/app/ui/icons/olive-dark/ripple.64.png b/app/ui/style/olive-dark/png/ripple.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/ripple.64.png
rename to app/ui/style/olive-dark/png/ripple.64.png
diff --git a/app/ui/icons/olive-dark/rolling.128.png b/app/ui/style/olive-dark/png/rolling.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/rolling.128.png
rename to app/ui/style/olive-dark/png/rolling.128.png
diff --git a/app/ui/icons/olive-dark/rolling.16.png b/app/ui/style/olive-dark/png/rolling.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/rolling.16.png
rename to app/ui/style/olive-dark/png/rolling.16.png
diff --git a/app/ui/icons/olive-dark/rolling.32.png b/app/ui/style/olive-dark/png/rolling.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/rolling.32.png
rename to app/ui/style/olive-dark/png/rolling.32.png
diff --git a/app/ui/icons/olive-dark/rolling.64.png b/app/ui/style/olive-dark/png/rolling.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/rolling.64.png
rename to app/ui/style/olive-dark/png/rolling.64.png
diff --git a/app/ui/icons/olive-dark/save.128.png b/app/ui/style/olive-dark/png/save.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/save.128.png
rename to app/ui/style/olive-dark/png/save.128.png
diff --git a/app/ui/icons/olive-dark/save.16.png b/app/ui/style/olive-dark/png/save.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/save.16.png
rename to app/ui/style/olive-dark/png/save.16.png
diff --git a/app/ui/icons/olive-dark/save.32.png b/app/ui/style/olive-dark/png/save.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/save.32.png
rename to app/ui/style/olive-dark/png/save.32.png
diff --git a/app/ui/icons/olive-dark/save.64.png b/app/ui/style/olive-dark/png/save.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/save.64.png
rename to app/ui/style/olive-dark/png/save.64.png
diff --git a/app/ui/icons/olive-dark/sequence.128.png b/app/ui/style/olive-dark/png/sequence.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/sequence.128.png
rename to app/ui/style/olive-dark/png/sequence.128.png
diff --git a/app/ui/icons/olive-dark/sequence.16.png b/app/ui/style/olive-dark/png/sequence.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/sequence.16.png
rename to app/ui/style/olive-dark/png/sequence.16.png
diff --git a/app/ui/icons/olive-dark/sequence.32.png b/app/ui/style/olive-dark/png/sequence.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/sequence.32.png
rename to app/ui/style/olive-dark/png/sequence.32.png
diff --git a/app/ui/icons/olive-dark/sequence.64.png b/app/ui/style/olive-dark/png/sequence.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/sequence.64.png
rename to app/ui/style/olive-dark/png/sequence.64.png
diff --git a/app/ui/icons/olive-dark/slide.128.png b/app/ui/style/olive-dark/png/slide.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/slide.128.png
rename to app/ui/style/olive-dark/png/slide.128.png
diff --git a/app/ui/icons/olive-dark/slide.16.png b/app/ui/style/olive-dark/png/slide.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/slide.16.png
rename to app/ui/style/olive-dark/png/slide.16.png
diff --git a/app/ui/icons/olive-dark/slide.32.png b/app/ui/style/olive-dark/png/slide.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/slide.32.png
rename to app/ui/style/olive-dark/png/slide.32.png
diff --git a/app/ui/icons/olive-dark/slide.64.png b/app/ui/style/olive-dark/png/slide.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/slide.64.png
rename to app/ui/style/olive-dark/png/slide.64.png
diff --git a/app/ui/icons/olive-dark/slip.128.png b/app/ui/style/olive-dark/png/slip.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/slip.128.png
rename to app/ui/style/olive-dark/png/slip.128.png
diff --git a/app/ui/icons/olive-dark/slip.16.png b/app/ui/style/olive-dark/png/slip.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/slip.16.png
rename to app/ui/style/olive-dark/png/slip.16.png
diff --git a/app/ui/icons/olive-dark/slip.32.png b/app/ui/style/olive-dark/png/slip.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/slip.32.png
rename to app/ui/style/olive-dark/png/slip.32.png
diff --git a/app/ui/icons/olive-dark/slip.64.png b/app/ui/style/olive-dark/png/slip.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/slip.64.png
rename to app/ui/style/olive-dark/png/slip.64.png
diff --git a/app/ui/icons/olive-dark/transition-tool.128.png b/app/ui/style/olive-dark/png/transition-tool.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/transition-tool.128.png
rename to app/ui/style/olive-dark/png/transition-tool.128.png
diff --git a/app/ui/icons/olive-dark/transition-tool.16.png b/app/ui/style/olive-dark/png/transition-tool.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/transition-tool.16.png
rename to app/ui/style/olive-dark/png/transition-tool.16.png
diff --git a/app/ui/icons/olive-dark/transition-tool.32.png b/app/ui/style/olive-dark/png/transition-tool.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/transition-tool.32.png
rename to app/ui/style/olive-dark/png/transition-tool.32.png
diff --git a/app/ui/icons/olive-dark/transition-tool.64.png b/app/ui/style/olive-dark/png/transition-tool.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/transition-tool.64.png
rename to app/ui/style/olive-dark/png/transition-tool.64.png
diff --git a/app/ui/icons/olive-dark/treeview.128.png b/app/ui/style/olive-dark/png/treeview.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/treeview.128.png
rename to app/ui/style/olive-dark/png/treeview.128.png
diff --git a/app/ui/icons/olive-dark/treeview.16.png b/app/ui/style/olive-dark/png/treeview.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/treeview.16.png
rename to app/ui/style/olive-dark/png/treeview.16.png
diff --git a/app/ui/icons/olive-dark/treeview.32.png b/app/ui/style/olive-dark/png/treeview.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/treeview.32.png
rename to app/ui/style/olive-dark/png/treeview.32.png
diff --git a/app/ui/icons/olive-dark/treeview.64.png b/app/ui/style/olive-dark/png/treeview.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/treeview.64.png
rename to app/ui/style/olive-dark/png/treeview.64.png
diff --git a/app/ui/icons/olive-dark/tri-down.128.png b/app/ui/style/olive-dark/png/tri-down.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-down.128.png
rename to app/ui/style/olive-dark/png/tri-down.128.png
diff --git a/app/ui/icons/olive-dark/tri-down.16.png b/app/ui/style/olive-dark/png/tri-down.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-down.16.png
rename to app/ui/style/olive-dark/png/tri-down.16.png
diff --git a/app/ui/icons/olive-dark/tri-down.32.png b/app/ui/style/olive-dark/png/tri-down.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-down.32.png
rename to app/ui/style/olive-dark/png/tri-down.32.png
diff --git a/app/ui/icons/olive-dark/tri-down.64.png b/app/ui/style/olive-dark/png/tri-down.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-down.64.png
rename to app/ui/style/olive-dark/png/tri-down.64.png
diff --git a/app/ui/icons/olive-dark/tri-left.128.png b/app/ui/style/olive-dark/png/tri-left.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-left.128.png
rename to app/ui/style/olive-dark/png/tri-left.128.png
diff --git a/app/ui/icons/olive-dark/tri-left.16.png b/app/ui/style/olive-dark/png/tri-left.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-left.16.png
rename to app/ui/style/olive-dark/png/tri-left.16.png
diff --git a/app/ui/icons/olive-dark/tri-left.32.png b/app/ui/style/olive-dark/png/tri-left.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-left.32.png
rename to app/ui/style/olive-dark/png/tri-left.32.png
diff --git a/app/ui/icons/olive-dark/tri-left.64.png b/app/ui/style/olive-dark/png/tri-left.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-left.64.png
rename to app/ui/style/olive-dark/png/tri-left.64.png
diff --git a/app/ui/icons/olive-dark/tri-right.128.png b/app/ui/style/olive-dark/png/tri-right.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-right.128.png
rename to app/ui/style/olive-dark/png/tri-right.128.png
diff --git a/app/ui/icons/olive-dark/tri-right.16.png b/app/ui/style/olive-dark/png/tri-right.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-right.16.png
rename to app/ui/style/olive-dark/png/tri-right.16.png
diff --git a/app/ui/icons/olive-dark/tri-right.32.png b/app/ui/style/olive-dark/png/tri-right.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-right.32.png
rename to app/ui/style/olive-dark/png/tri-right.32.png
diff --git a/app/ui/icons/olive-dark/tri-right.64.png b/app/ui/style/olive-dark/png/tri-right.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-right.64.png
rename to app/ui/style/olive-dark/png/tri-right.64.png
diff --git a/app/ui/icons/olive-dark/tri-up.128.png b/app/ui/style/olive-dark/png/tri-up.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-up.128.png
rename to app/ui/style/olive-dark/png/tri-up.128.png
diff --git a/app/ui/icons/olive-dark/tri-up.16.png b/app/ui/style/olive-dark/png/tri-up.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-up.16.png
rename to app/ui/style/olive-dark/png/tri-up.16.png
diff --git a/app/ui/icons/olive-dark/tri-up.32.png b/app/ui/style/olive-dark/png/tri-up.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-up.32.png
rename to app/ui/style/olive-dark/png/tri-up.32.png
diff --git a/app/ui/icons/olive-dark/tri-up.64.png b/app/ui/style/olive-dark/png/tri-up.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/tri-up.64.png
rename to app/ui/style/olive-dark/png/tri-up.64.png
diff --git a/app/ui/icons/olive-dark/underline.128.png b/app/ui/style/olive-dark/png/underline.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/underline.128.png
rename to app/ui/style/olive-dark/png/underline.128.png
diff --git a/app/ui/icons/olive-dark/underline.16.png b/app/ui/style/olive-dark/png/underline.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/underline.16.png
rename to app/ui/style/olive-dark/png/underline.16.png
diff --git a/app/ui/icons/olive-dark/underline.32.png b/app/ui/style/olive-dark/png/underline.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/underline.32.png
rename to app/ui/style/olive-dark/png/underline.32.png
diff --git a/app/ui/icons/olive-dark/underline.64.png b/app/ui/style/olive-dark/png/underline.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/underline.64.png
rename to app/ui/style/olive-dark/png/underline.64.png
diff --git a/app/ui/icons/olive-dark/undo.128.png b/app/ui/style/olive-dark/png/undo.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/undo.128.png
rename to app/ui/style/olive-dark/png/undo.128.png
diff --git a/app/ui/icons/olive-dark/undo.16.png b/app/ui/style/olive-dark/png/undo.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/undo.16.png
rename to app/ui/style/olive-dark/png/undo.16.png
diff --git a/app/ui/icons/olive-dark/undo.32.png b/app/ui/style/olive-dark/png/undo.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/undo.32.png
rename to app/ui/style/olive-dark/png/undo.32.png
diff --git a/app/ui/icons/olive-dark/undo.64.png b/app/ui/style/olive-dark/png/undo.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/undo.64.png
rename to app/ui/style/olive-dark/png/undo.64.png
diff --git a/app/ui/icons/olive-dark/videosource.128.png b/app/ui/style/olive-dark/png/videosource.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/videosource.128.png
rename to app/ui/style/olive-dark/png/videosource.128.png
diff --git a/app/ui/icons/olive-dark/videosource.16.png b/app/ui/style/olive-dark/png/videosource.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/videosource.16.png
rename to app/ui/style/olive-dark/png/videosource.16.png
diff --git a/app/ui/icons/olive-dark/videosource.32.png b/app/ui/style/olive-dark/png/videosource.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/videosource.32.png
rename to app/ui/style/olive-dark/png/videosource.32.png
diff --git a/app/ui/icons/olive-dark/videosource.64.png b/app/ui/style/olive-dark/png/videosource.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/videosource.64.png
rename to app/ui/style/olive-dark/png/videosource.64.png
diff --git a/app/ui/icons/olive-dark/zoomin.128.png b/app/ui/style/olive-dark/png/zoomin.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomin.128.png
rename to app/ui/style/olive-dark/png/zoomin.128.png
diff --git a/app/ui/icons/olive-dark/zoomin.16.png b/app/ui/style/olive-dark/png/zoomin.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomin.16.png
rename to app/ui/style/olive-dark/png/zoomin.16.png
diff --git a/app/ui/icons/olive-dark/zoomin.32.png b/app/ui/style/olive-dark/png/zoomin.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomin.32.png
rename to app/ui/style/olive-dark/png/zoomin.32.png
diff --git a/app/ui/icons/olive-dark/zoomin.64.png b/app/ui/style/olive-dark/png/zoomin.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomin.64.png
rename to app/ui/style/olive-dark/png/zoomin.64.png
diff --git a/app/ui/icons/olive-dark/zoomout.128.png b/app/ui/style/olive-dark/png/zoomout.128.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomout.128.png
rename to app/ui/style/olive-dark/png/zoomout.128.png
diff --git a/app/ui/icons/olive-dark/zoomout.16.png b/app/ui/style/olive-dark/png/zoomout.16.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomout.16.png
rename to app/ui/style/olive-dark/png/zoomout.16.png
diff --git a/app/ui/icons/olive-dark/zoomout.32.png b/app/ui/style/olive-dark/png/zoomout.32.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomout.32.png
rename to app/ui/style/olive-dark/png/zoomout.32.png
diff --git a/app/ui/icons/olive-dark/zoomout.64.png b/app/ui/style/olive-dark/png/zoomout.64.png
similarity index 100%
rename from app/ui/icons/olive-dark/zoomout.64.png
rename to app/ui/style/olive-dark/png/zoomout.64.png
diff --git a/app/ui/style/css/olive-dark.css b/app/ui/style/olive-dark/style.css
similarity index 100%
rename from app/ui/style/css/olive-dark.css
rename to app/ui/style/olive-dark/style.css
diff --git a/app/ui/icons/olive-dark/svg/add-button.svg b/app/ui/style/olive-dark/svg/add-button.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/add-button.svg
rename to app/ui/style/olive-dark/svg/add-button.svg
diff --git a/app/ui/icons/olive-dark/svg/add-effect.svg b/app/ui/style/olive-dark/svg/add-effect.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/add-effect.svg
rename to app/ui/style/olive-dark/svg/add-effect.svg
diff --git a/app/ui/icons/olive-dark/svg/add-transition.svg b/app/ui/style/olive-dark/svg/add-transition.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/add-transition.svg
rename to app/ui/style/olive-dark/svg/add-transition.svg
diff --git a/app/ui/icons/olive-dark/svg/align-center.svg b/app/ui/style/olive-dark/svg/align-center.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/align-center.svg
rename to app/ui/style/olive-dark/svg/align-center.svg
diff --git a/app/ui/icons/olive-dark/svg/align-left.svg b/app/ui/style/olive-dark/svg/align-left.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/align-left.svg
rename to app/ui/style/olive-dark/svg/align-left.svg
diff --git a/app/ui/icons/olive-dark/svg/align-right.svg b/app/ui/style/olive-dark/svg/align-right.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/align-right.svg
rename to app/ui/style/olive-dark/svg/align-right.svg
diff --git a/app/ui/icons/olive-dark/svg/arrow.svg b/app/ui/style/olive-dark/svg/arrow.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/arrow.svg
rename to app/ui/style/olive-dark/svg/arrow.svg
diff --git a/app/ui/icons/olive-dark/svg/audiosource.svg b/app/ui/style/olive-dark/svg/audiosource.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/audiosource.svg
rename to app/ui/style/olive-dark/svg/audiosource.svg
diff --git a/app/ui/icons/olive-dark/svg/beam.svg b/app/ui/style/olive-dark/svg/beam.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/beam.svg
rename to app/ui/style/olive-dark/svg/beam.svg
diff --git a/app/ui/icons/olive-dark/svg/clock.svg b/app/ui/style/olive-dark/svg/clock.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/clock.svg
rename to app/ui/style/olive-dark/svg/clock.svg
diff --git a/app/ui/icons/olive-dark/svg/diamond.svg b/app/ui/style/olive-dark/svg/diamond.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/diamond.svg
rename to app/ui/style/olive-dark/svg/diamond.svg
diff --git a/app/ui/icons/olive-dark/svg/dirup.svg b/app/ui/style/olive-dark/svg/dirup.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/dirup.svg
rename to app/ui/style/olive-dark/svg/dirup.svg
diff --git a/app/ui/icons/olive-dark/svg/error.svg b/app/ui/style/olive-dark/svg/error.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/error.svg
rename to app/ui/style/olive-dark/svg/error.svg
diff --git a/app/ui/icons/olive-dark/svg/ff.svg b/app/ui/style/olive-dark/svg/ff.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/ff.svg
rename to app/ui/style/olive-dark/svg/ff.svg
diff --git a/app/ui/icons/olive-dark/svg/folder.svg b/app/ui/style/olive-dark/svg/folder.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/folder.svg
rename to app/ui/style/olive-dark/svg/folder.svg
diff --git a/app/ui/icons/olive-dark/svg/hand.svg b/app/ui/style/olive-dark/svg/hand.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/hand.svg
rename to app/ui/style/olive-dark/svg/hand.svg
diff --git a/app/ui/icons/olive-dark/svg/iconview.svg b/app/ui/style/olive-dark/svg/iconview.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/iconview.svg
rename to app/ui/style/olive-dark/svg/iconview.svg
diff --git a/app/ui/icons/olive-dark/svg/imagesource.svg b/app/ui/style/olive-dark/svg/imagesource.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/imagesource.svg
rename to app/ui/style/olive-dark/svg/imagesource.svg
diff --git a/app/ui/icons/olive-dark/svg/italic.svg b/app/ui/style/olive-dark/svg/italic.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/italic.svg
rename to app/ui/style/olive-dark/svg/italic.svg
diff --git a/app/ui/icons/olive-dark/svg/justify-center.svg b/app/ui/style/olive-dark/svg/justify-center.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/justify-center.svg
rename to app/ui/style/olive-dark/svg/justify-center.svg
diff --git a/app/ui/icons/olive-dark/svg/listview.svg b/app/ui/style/olive-dark/svg/listview.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/listview.svg
rename to app/ui/style/olive-dark/svg/listview.svg
diff --git a/app/ui/icons/olive-dark/svg/magnet.svg b/app/ui/style/olive-dark/svg/magnet.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/magnet.svg
rename to app/ui/style/olive-dark/svg/magnet.svg
diff --git a/app/ui/icons/olive-dark/svg/new.svg b/app/ui/style/olive-dark/svg/new.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/new.svg
rename to app/ui/style/olive-dark/svg/new.svg
diff --git a/app/ui/icons/olive-dark/svg/next.svg b/app/ui/style/olive-dark/svg/next.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/next.svg
rename to app/ui/style/olive-dark/svg/next.svg
diff --git a/app/ui/icons/olive-dark/svg/open.svg b/app/ui/style/olive-dark/svg/open.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/open.svg
rename to app/ui/style/olive-dark/svg/open.svg
diff --git a/app/ui/icons/olive-dark/svg/pause.svg b/app/ui/style/olive-dark/svg/pause.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/pause.svg
rename to app/ui/style/olive-dark/svg/pause.svg
diff --git a/app/ui/icons/olive-dark/svg/play.svg b/app/ui/style/olive-dark/svg/play.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/play.svg
rename to app/ui/style/olive-dark/svg/play.svg
diff --git a/app/ui/icons/olive-dark/svg/prev.svg b/app/ui/style/olive-dark/svg/prev.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/prev.svg
rename to app/ui/style/olive-dark/svg/prev.svg
diff --git a/app/ui/icons/olive-dark/svg/razor.svg b/app/ui/style/olive-dark/svg/razor.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/razor.svg
rename to app/ui/style/olive-dark/svg/razor.svg
diff --git a/app/ui/icons/olive-dark/svg/record.svg b/app/ui/style/olive-dark/svg/record.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/record.svg
rename to app/ui/style/olive-dark/svg/record.svg
diff --git a/app/ui/icons/olive-dark/svg/redo.svg b/app/ui/style/olive-dark/svg/redo.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/redo.svg
rename to app/ui/style/olive-dark/svg/redo.svg
diff --git a/app/ui/icons/olive-dark/svg/rew.svg b/app/ui/style/olive-dark/svg/rew.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/rew.svg
rename to app/ui/style/olive-dark/svg/rew.svg
diff --git a/app/ui/icons/olive-dark/svg/ripple.svg b/app/ui/style/olive-dark/svg/ripple.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/ripple.svg
rename to app/ui/style/olive-dark/svg/ripple.svg
diff --git a/app/ui/icons/olive-dark/svg/rolling.svg b/app/ui/style/olive-dark/svg/rolling.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/rolling.svg
rename to app/ui/style/olive-dark/svg/rolling.svg
diff --git a/app/ui/icons/olive-dark/svg/save.svg b/app/ui/style/olive-dark/svg/save.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/save.svg
rename to app/ui/style/olive-dark/svg/save.svg
diff --git a/app/ui/icons/olive-dark/svg/sequence.svg b/app/ui/style/olive-dark/svg/sequence.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/sequence.svg
rename to app/ui/style/olive-dark/svg/sequence.svg
diff --git a/app/ui/icons/olive-dark/svg/slide.svg b/app/ui/style/olive-dark/svg/slide.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/slide.svg
rename to app/ui/style/olive-dark/svg/slide.svg
diff --git a/app/ui/icons/olive-dark/svg/slip.svg b/app/ui/style/olive-dark/svg/slip.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/slip.svg
rename to app/ui/style/olive-dark/svg/slip.svg
diff --git a/app/ui/icons/olive-dark/svg/transition-tool.svg b/app/ui/style/olive-dark/svg/transition-tool.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/transition-tool.svg
rename to app/ui/style/olive-dark/svg/transition-tool.svg
diff --git a/app/ui/icons/olive-dark/svg/treeview.svg b/app/ui/style/olive-dark/svg/treeview.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/treeview.svg
rename to app/ui/style/olive-dark/svg/treeview.svg
diff --git a/app/ui/icons/olive-dark/svg/tri-down.svg b/app/ui/style/olive-dark/svg/tri-down.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/tri-down.svg
rename to app/ui/style/olive-dark/svg/tri-down.svg
diff --git a/app/ui/icons/olive-dark/svg/tri-left.svg b/app/ui/style/olive-dark/svg/tri-left.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/tri-left.svg
rename to app/ui/style/olive-dark/svg/tri-left.svg
diff --git a/app/ui/icons/olive-dark/svg/tri-right.svg b/app/ui/style/olive-dark/svg/tri-right.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/tri-right.svg
rename to app/ui/style/olive-dark/svg/tri-right.svg
diff --git a/app/ui/icons/olive-dark/svg/tri-up.svg b/app/ui/style/olive-dark/svg/tri-up.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/tri-up.svg
rename to app/ui/style/olive-dark/svg/tri-up.svg
diff --git a/app/ui/icons/olive-dark/svg/underline.svg b/app/ui/style/olive-dark/svg/underline.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/underline.svg
rename to app/ui/style/olive-dark/svg/underline.svg
diff --git a/app/ui/icons/olive-dark/svg/undo.svg b/app/ui/style/olive-dark/svg/undo.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/undo.svg
rename to app/ui/style/olive-dark/svg/undo.svg
diff --git a/app/ui/icons/olive-dark/svg/videosource.svg b/app/ui/style/olive-dark/svg/videosource.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/videosource.svg
rename to app/ui/style/olive-dark/svg/videosource.svg
diff --git a/app/ui/icons/olive-dark/svg/zoomin.svg b/app/ui/style/olive-dark/svg/zoomin.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/zoomin.svg
rename to app/ui/style/olive-dark/svg/zoomin.svg
diff --git a/app/ui/icons/olive-dark/svg/zoomout.svg b/app/ui/style/olive-dark/svg/zoomout.svg
similarity index 100%
rename from app/ui/icons/olive-dark/svg/zoomout.svg
rename to app/ui/style/olive-dark/svg/zoomout.svg
diff --git a/app/ui/style/olive-light/olive-light.qrc b/app/ui/style/olive-light/olive-light.qrc
new file mode 100644
index 000000000..d910c3a36
--- /dev/null
+++ b/app/ui/style/olive-light/olive-light.qrc
@@ -0,0 +1,201 @@
+<RCC>
+  <qresource prefix="/style/olive-light">
+    <file>style.css</file>
+    <file>png/add-button.16.png</file>
+    <file>png/add-button.32.png</file>
+    <file>png/add-button.64.png</file>
+    <file>png/add-button.128.png</file>
+    <file>png/add-effect.16.png</file>
+    <file>png/add-effect.32.png</file>
+    <file>png/add-effect.64.png</file>
+    <file>png/add-effect.128.png</file>
+    <file>png/add-transition.16.png</file>
+    <file>png/add-transition.32.png</file>
+    <file>png/add-transition.64.png</file>
+    <file>png/add-transition.128.png</file>
+    <file>png/align-center.16.png</file>
+    <file>png/align-center.32.png</file>
+    <file>png/align-center.64.png</file>
+    <file>png/align-center.128.png</file>
+    <file>png/align-left.16.png</file>
+    <file>png/align-left.32.png</file>
+    <file>png/align-left.64.png</file>
+    <file>png/align-left.128.png</file>
+    <file>png/align-right.16.png</file>
+    <file>png/align-right.32.png</file>
+    <file>png/align-right.64.png</file>
+    <file>png/align-right.128.png</file>
+    <file>png/arrow.16.png</file>
+    <file>png/arrow.32.png</file>
+    <file>png/arrow.64.png</file>
+    <file>png/arrow.128.png</file>
+    <file>png/audiosource.16.png</file>
+    <file>png/audiosource.32.png</file>
+    <file>png/audiosource.64.png</file>
+    <file>png/audiosource.128.png</file>
+    <file>png/beam.16.png</file>
+    <file>png/beam.32.png</file>
+    <file>png/beam.64.png</file>
+    <file>png/beam.128.png</file>
+    <file>png/clock.16.png</file>
+    <file>png/clock.32.png</file>
+    <file>png/clock.64.png</file>
+    <file>png/clock.128.png</file>
+    <file>png/diamond.16.png</file>
+    <file>png/diamond.32.png</file>
+    <file>png/diamond.64.png</file>
+    <file>png/diamond.128.png</file>
+    <file>png/dirup.16.png</file>
+    <file>png/dirup.32.png</file>
+    <file>png/dirup.64.png</file>
+    <file>png/dirup.128.png</file>
+    <file>png/error.16.png</file>
+    <file>png/error.32.png</file>
+    <file>png/error.64.png</file>
+    <file>png/error.128.png</file>
+    <file>png/ff.16.png</file>
+    <file>png/ff.32.png</file>
+    <file>png/ff.64.png</file>
+    <file>png/ff.128.png</file>
+    <file>png/folder.16.png</file>
+    <file>png/folder.32.png</file>
+    <file>png/folder.64.png</file>
+    <file>png/folder.128.png</file>
+    <file>png/hand.16.png</file>
+    <file>png/hand.32.png</file>
+    <file>png/hand.64.png</file>
+    <file>png/hand.128.png</file>
+    <file>png/iconview.16.png</file>
+    <file>png/iconview.32.png</file>
+    <file>png/iconview.64.png</file>
+    <file>png/iconview.128.png</file>
+    <file>png/imagesource.16.png</file>
+    <file>png/imagesource.32.png</file>
+    <file>png/imagesource.64.png</file>
+    <file>png/imagesource.128.png</file>
+    <file>png/italic.16.png</file>
+    <file>png/italic.32.png</file>
+    <file>png/italic.64.png</file>
+    <file>png/italic.128.png</file>
+    <file>png/justify-center.16.png</file>
+    <file>png/justify-center.32.png</file>
+    <file>png/justify-center.64.png</file>
+    <file>png/justify-center.128.png</file>
+    <file>png/listview.16.png</file>
+    <file>png/listview.32.png</file>
+    <file>png/listview.64.png</file>
+    <file>png/listview.128.png</file>
+    <file>png/magnet.16.png</file>
+    <file>png/magnet.32.png</file>
+    <file>png/magnet.64.png</file>
+    <file>png/magnet.128.png</file>
+    <file>png/new.16.png</file>
+    <file>png/new.32.png</file>
+    <file>png/new.64.png</file>
+    <file>png/new.128.png</file>
+    <file>png/next.16.png</file>
+    <file>png/next.32.png</file>
+    <file>png/next.64.png</file>
+    <file>png/next.128.png</file>
+    <file>png/open.16.png</file>
+    <file>png/open.32.png</file>
+    <file>png/open.64.png</file>
+    <file>png/open.128.png</file>
+    <file>png/pause.16.png</file>
+    <file>png/pause.32.png</file>
+    <file>png/pause.64.png</file>
+    <file>png/pause.128.png</file>
+    <file>png/play.16.png</file>
+    <file>png/play.32.png</file>
+    <file>png/play.64.png</file>
+    <file>png/play.128.png</file>
+    <file>png/prev.16.png</file>
+    <file>png/prev.32.png</file>
+    <file>png/prev.64.png</file>
+    <file>png/prev.128.png</file>
+    <file>png/razor.16.png</file>
+    <file>png/razor.32.png</file>
+    <file>png/razor.64.png</file>
+    <file>png/razor.128.png</file>
+    <file>png/record.16.png</file>
+    <file>png/record.32.png</file>
+    <file>png/record.64.png</file>
+    <file>png/record.128.png</file>
+    <file>png/redo.16.png</file>
+    <file>png/redo.32.png</file>
+    <file>png/redo.64.png</file>
+    <file>png/redo.128.png</file>
+    <file>png/rew.16.png</file>
+    <file>png/rew.32.png</file>
+    <file>png/rew.64.png</file>
+    <file>png/rew.128.png</file>
+    <file>png/ripple.16.png</file>
+    <file>png/ripple.32.png</file>
+    <file>png/ripple.64.png</file>
+    <file>png/ripple.128.png</file>
+    <file>png/rolling.16.png</file>
+    <file>png/rolling.32.png</file>
+    <file>png/rolling.64.png</file>
+    <file>png/rolling.128.png</file>
+    <file>png/save.16.png</file>
+    <file>png/save.32.png</file>
+    <file>png/save.64.png</file>
+    <file>png/save.128.png</file>
+    <file>png/sequence.16.png</file>
+    <file>png/sequence.32.png</file>
+    <file>png/sequence.64.png</file>
+    <file>png/sequence.128.png</file>
+    <file>png/slide.16.png</file>
+    <file>png/slide.32.png</file>
+    <file>png/slide.64.png</file>
+    <file>png/slide.128.png</file>
+    <file>png/slip.16.png</file>
+    <file>png/slip.32.png</file>
+    <file>png/slip.64.png</file>
+    <file>png/slip.128.png</file>
+    <file>png/transition-tool.16.png</file>
+    <file>png/transition-tool.32.png</file>
+    <file>png/transition-tool.64.png</file>
+    <file>png/transition-tool.128.png</file>
+    <file>png/treeview.16.png</file>
+    <file>png/treeview.32.png</file>
+    <file>png/treeview.64.png</file>
+    <file>png/treeview.128.png</file>
+    <file>png/tri-down.16.png</file>
+    <file>png/tri-down.32.png</file>
+    <file>png/tri-down.64.png</file>
+    <file>png/tri-down.128.png</file>
+    <file>png/tri-left.16.png</file>
+    <file>png/tri-left.32.png</file>
+    <file>png/tri-left.64.png</file>
+    <file>png/tri-left.128.png</file>
+    <file>png/tri-right.16.png</file>
+    <file>png/tri-right.32.png</file>
+    <file>png/tri-right.64.png</file>
+    <file>png/tri-right.128.png</file>
+    <file>png/tri-up.16.png</file>
+    <file>png/tri-up.32.png</file>
+    <file>png/tri-up.64.png</file>
+    <file>png/tri-up.128.png</file>
+    <file>png/underline.16.png</file>
+    <file>png/underline.32.png</file>
+    <file>png/underline.64.png</file>
+    <file>png/underline.128.png</file>
+    <file>png/undo.16.png</file>
+    <file>png/undo.32.png</file>
+    <file>png/undo.64.png</file>
+    <file>png/undo.128.png</file>
+    <file>png/videosource.16.png</file>
+    <file>png/videosource.32.png</file>
+    <file>png/videosource.64.png</file>
+    <file>png/videosource.128.png</file>
+    <file>png/zoomin.16.png</file>
+    <file>png/zoomin.32.png</file>
+    <file>png/zoomin.64.png</file>
+    <file>png/zoomin.128.png</file>
+    <file>png/zoomout.16.png</file>
+    <file>png/zoomout.32.png</file>
+    <file>png/zoomout.64.png</file>
+    <file>png/zoomout.128.png</file>
+  </qresource>
+</RCC>
diff --git a/app/ui/icons/olive-light/add-button.128.png b/app/ui/style/olive-light/png/add-button.128.png
similarity index 100%
rename from app/ui/icons/olive-light/add-button.128.png
rename to app/ui/style/olive-light/png/add-button.128.png
diff --git a/app/ui/icons/olive-light/add-button.16.png b/app/ui/style/olive-light/png/add-button.16.png
similarity index 100%
rename from app/ui/icons/olive-light/add-button.16.png
rename to app/ui/style/olive-light/png/add-button.16.png
diff --git a/app/ui/icons/olive-light/add-button.32.png b/app/ui/style/olive-light/png/add-button.32.png
similarity index 100%
rename from app/ui/icons/olive-light/add-button.32.png
rename to app/ui/style/olive-light/png/add-button.32.png
diff --git a/app/ui/icons/olive-light/add-button.64.png b/app/ui/style/olive-light/png/add-button.64.png
similarity index 100%
rename from app/ui/icons/olive-light/add-button.64.png
rename to app/ui/style/olive-light/png/add-button.64.png
diff --git a/app/ui/icons/olive-light/add-effect.128.png b/app/ui/style/olive-light/png/add-effect.128.png
similarity index 100%
rename from app/ui/icons/olive-light/add-effect.128.png
rename to app/ui/style/olive-light/png/add-effect.128.png
diff --git a/app/ui/icons/olive-light/add-effect.16.png b/app/ui/style/olive-light/png/add-effect.16.png
similarity index 100%
rename from app/ui/icons/olive-light/add-effect.16.png
rename to app/ui/style/olive-light/png/add-effect.16.png
diff --git a/app/ui/icons/olive-light/add-effect.32.png b/app/ui/style/olive-light/png/add-effect.32.png
similarity index 100%
rename from app/ui/icons/olive-light/add-effect.32.png
rename to app/ui/style/olive-light/png/add-effect.32.png
diff --git a/app/ui/icons/olive-light/add-effect.64.png b/app/ui/style/olive-light/png/add-effect.64.png
similarity index 100%
rename from app/ui/icons/olive-light/add-effect.64.png
rename to app/ui/style/olive-light/png/add-effect.64.png
diff --git a/app/ui/icons/olive-light/add-transition.128.png b/app/ui/style/olive-light/png/add-transition.128.png
similarity index 100%
rename from app/ui/icons/olive-light/add-transition.128.png
rename to app/ui/style/olive-light/png/add-transition.128.png
diff --git a/app/ui/icons/olive-light/add-transition.16.png b/app/ui/style/olive-light/png/add-transition.16.png
similarity index 100%
rename from app/ui/icons/olive-light/add-transition.16.png
rename to app/ui/style/olive-light/png/add-transition.16.png
diff --git a/app/ui/icons/olive-light/add-transition.32.png b/app/ui/style/olive-light/png/add-transition.32.png
similarity index 100%
rename from app/ui/icons/olive-light/add-transition.32.png
rename to app/ui/style/olive-light/png/add-transition.32.png
diff --git a/app/ui/icons/olive-light/add-transition.64.png b/app/ui/style/olive-light/png/add-transition.64.png
similarity index 100%
rename from app/ui/icons/olive-light/add-transition.64.png
rename to app/ui/style/olive-light/png/add-transition.64.png
diff --git a/app/ui/icons/olive-light/align-center.128.png b/app/ui/style/olive-light/png/align-center.128.png
similarity index 100%
rename from app/ui/icons/olive-light/align-center.128.png
rename to app/ui/style/olive-light/png/align-center.128.png
diff --git a/app/ui/icons/olive-light/align-center.16.png b/app/ui/style/olive-light/png/align-center.16.png
similarity index 100%
rename from app/ui/icons/olive-light/align-center.16.png
rename to app/ui/style/olive-light/png/align-center.16.png
diff --git a/app/ui/icons/olive-light/align-center.32.png b/app/ui/style/olive-light/png/align-center.32.png
similarity index 100%
rename from app/ui/icons/olive-light/align-center.32.png
rename to app/ui/style/olive-light/png/align-center.32.png
diff --git a/app/ui/icons/olive-light/align-center.64.png b/app/ui/style/olive-light/png/align-center.64.png
similarity index 100%
rename from app/ui/icons/olive-light/align-center.64.png
rename to app/ui/style/olive-light/png/align-center.64.png
diff --git a/app/ui/icons/olive-light/align-left.128.png b/app/ui/style/olive-light/png/align-left.128.png
similarity index 100%
rename from app/ui/icons/olive-light/align-left.128.png
rename to app/ui/style/olive-light/png/align-left.128.png
diff --git a/app/ui/icons/olive-light/align-left.16.png b/app/ui/style/olive-light/png/align-left.16.png
similarity index 100%
rename from app/ui/icons/olive-light/align-left.16.png
rename to app/ui/style/olive-light/png/align-left.16.png
diff --git a/app/ui/icons/olive-light/align-left.32.png b/app/ui/style/olive-light/png/align-left.32.png
similarity index 100%
rename from app/ui/icons/olive-light/align-left.32.png
rename to app/ui/style/olive-light/png/align-left.32.png
diff --git a/app/ui/icons/olive-light/align-left.64.png b/app/ui/style/olive-light/png/align-left.64.png
similarity index 100%
rename from app/ui/icons/olive-light/align-left.64.png
rename to app/ui/style/olive-light/png/align-left.64.png
diff --git a/app/ui/icons/olive-light/align-right.128.png b/app/ui/style/olive-light/png/align-right.128.png
similarity index 100%
rename from app/ui/icons/olive-light/align-right.128.png
rename to app/ui/style/olive-light/png/align-right.128.png
diff --git a/app/ui/icons/olive-light/align-right.16.png b/app/ui/style/olive-light/png/align-right.16.png
similarity index 100%
rename from app/ui/icons/olive-light/align-right.16.png
rename to app/ui/style/olive-light/png/align-right.16.png
diff --git a/app/ui/icons/olive-light/align-right.32.png b/app/ui/style/olive-light/png/align-right.32.png
similarity index 100%
rename from app/ui/icons/olive-light/align-right.32.png
rename to app/ui/style/olive-light/png/align-right.32.png
diff --git a/app/ui/icons/olive-light/align-right.64.png b/app/ui/style/olive-light/png/align-right.64.png
similarity index 100%
rename from app/ui/icons/olive-light/align-right.64.png
rename to app/ui/style/olive-light/png/align-right.64.png
diff --git a/app/ui/icons/olive-light/arrow.128.png b/app/ui/style/olive-light/png/arrow.128.png
similarity index 100%
rename from app/ui/icons/olive-light/arrow.128.png
rename to app/ui/style/olive-light/png/arrow.128.png
diff --git a/app/ui/icons/olive-light/arrow.16.png b/app/ui/style/olive-light/png/arrow.16.png
similarity index 100%
rename from app/ui/icons/olive-light/arrow.16.png
rename to app/ui/style/olive-light/png/arrow.16.png
diff --git a/app/ui/icons/olive-light/arrow.32.png b/app/ui/style/olive-light/png/arrow.32.png
similarity index 100%
rename from app/ui/icons/olive-light/arrow.32.png
rename to app/ui/style/olive-light/png/arrow.32.png
diff --git a/app/ui/icons/olive-light/arrow.64.png b/app/ui/style/olive-light/png/arrow.64.png
similarity index 100%
rename from app/ui/icons/olive-light/arrow.64.png
rename to app/ui/style/olive-light/png/arrow.64.png
diff --git a/app/ui/icons/olive-light/audiosource.128.png b/app/ui/style/olive-light/png/audiosource.128.png
similarity index 100%
rename from app/ui/icons/olive-light/audiosource.128.png
rename to app/ui/style/olive-light/png/audiosource.128.png
diff --git a/app/ui/icons/olive-light/audiosource.16.png b/app/ui/style/olive-light/png/audiosource.16.png
similarity index 100%
rename from app/ui/icons/olive-light/audiosource.16.png
rename to app/ui/style/olive-light/png/audiosource.16.png
diff --git a/app/ui/icons/olive-light/audiosource.32.png b/app/ui/style/olive-light/png/audiosource.32.png
similarity index 100%
rename from app/ui/icons/olive-light/audiosource.32.png
rename to app/ui/style/olive-light/png/audiosource.32.png
diff --git a/app/ui/icons/olive-light/audiosource.64.png b/app/ui/style/olive-light/png/audiosource.64.png
similarity index 100%
rename from app/ui/icons/olive-light/audiosource.64.png
rename to app/ui/style/olive-light/png/audiosource.64.png
diff --git a/app/ui/icons/olive-light/beam.128.png b/app/ui/style/olive-light/png/beam.128.png
similarity index 100%
rename from app/ui/icons/olive-light/beam.128.png
rename to app/ui/style/olive-light/png/beam.128.png
diff --git a/app/ui/icons/olive-light/beam.16.png b/app/ui/style/olive-light/png/beam.16.png
similarity index 100%
rename from app/ui/icons/olive-light/beam.16.png
rename to app/ui/style/olive-light/png/beam.16.png
diff --git a/app/ui/icons/olive-light/beam.32.png b/app/ui/style/olive-light/png/beam.32.png
similarity index 100%
rename from app/ui/icons/olive-light/beam.32.png
rename to app/ui/style/olive-light/png/beam.32.png
diff --git a/app/ui/icons/olive-light/beam.64.png b/app/ui/style/olive-light/png/beam.64.png
similarity index 100%
rename from app/ui/icons/olive-light/beam.64.png
rename to app/ui/style/olive-light/png/beam.64.png
diff --git a/app/ui/icons/olive-light/clock.128.png b/app/ui/style/olive-light/png/clock.128.png
similarity index 100%
rename from app/ui/icons/olive-light/clock.128.png
rename to app/ui/style/olive-light/png/clock.128.png
diff --git a/app/ui/icons/olive-light/clock.16.png b/app/ui/style/olive-light/png/clock.16.png
similarity index 100%
rename from app/ui/icons/olive-light/clock.16.png
rename to app/ui/style/olive-light/png/clock.16.png
diff --git a/app/ui/icons/olive-light/clock.32.png b/app/ui/style/olive-light/png/clock.32.png
similarity index 100%
rename from app/ui/icons/olive-light/clock.32.png
rename to app/ui/style/olive-light/png/clock.32.png
diff --git a/app/ui/icons/olive-light/clock.64.png b/app/ui/style/olive-light/png/clock.64.png
similarity index 100%
rename from app/ui/icons/olive-light/clock.64.png
rename to app/ui/style/olive-light/png/clock.64.png
diff --git a/app/ui/icons/olive-light/diamond.128.png b/app/ui/style/olive-light/png/diamond.128.png
similarity index 100%
rename from app/ui/icons/olive-light/diamond.128.png
rename to app/ui/style/olive-light/png/diamond.128.png
diff --git a/app/ui/icons/olive-light/diamond.16.png b/app/ui/style/olive-light/png/diamond.16.png
similarity index 100%
rename from app/ui/icons/olive-light/diamond.16.png
rename to app/ui/style/olive-light/png/diamond.16.png
diff --git a/app/ui/icons/olive-light/diamond.32.png b/app/ui/style/olive-light/png/diamond.32.png
similarity index 100%
rename from app/ui/icons/olive-light/diamond.32.png
rename to app/ui/style/olive-light/png/diamond.32.png
diff --git a/app/ui/icons/olive-light/diamond.64.png b/app/ui/style/olive-light/png/diamond.64.png
similarity index 100%
rename from app/ui/icons/olive-light/diamond.64.png
rename to app/ui/style/olive-light/png/diamond.64.png
diff --git a/app/ui/icons/olive-light/dirup.128.png b/app/ui/style/olive-light/png/dirup.128.png
similarity index 100%
rename from app/ui/icons/olive-light/dirup.128.png
rename to app/ui/style/olive-light/png/dirup.128.png
diff --git a/app/ui/icons/olive-light/dirup.16.png b/app/ui/style/olive-light/png/dirup.16.png
similarity index 100%
rename from app/ui/icons/olive-light/dirup.16.png
rename to app/ui/style/olive-light/png/dirup.16.png
diff --git a/app/ui/icons/olive-light/dirup.32.png b/app/ui/style/olive-light/png/dirup.32.png
similarity index 100%
rename from app/ui/icons/olive-light/dirup.32.png
rename to app/ui/style/olive-light/png/dirup.32.png
diff --git a/app/ui/icons/olive-light/dirup.64.png b/app/ui/style/olive-light/png/dirup.64.png
similarity index 100%
rename from app/ui/icons/olive-light/dirup.64.png
rename to app/ui/style/olive-light/png/dirup.64.png
diff --git a/app/ui/icons/olive-light/error.128.png b/app/ui/style/olive-light/png/error.128.png
similarity index 100%
rename from app/ui/icons/olive-light/error.128.png
rename to app/ui/style/olive-light/png/error.128.png
diff --git a/app/ui/icons/olive-light/error.16.png b/app/ui/style/olive-light/png/error.16.png
similarity index 100%
rename from app/ui/icons/olive-light/error.16.png
rename to app/ui/style/olive-light/png/error.16.png
diff --git a/app/ui/icons/olive-light/error.32.png b/app/ui/style/olive-light/png/error.32.png
similarity index 100%
rename from app/ui/icons/olive-light/error.32.png
rename to app/ui/style/olive-light/png/error.32.png
diff --git a/app/ui/icons/olive-light/error.64.png b/app/ui/style/olive-light/png/error.64.png
similarity index 100%
rename from app/ui/icons/olive-light/error.64.png
rename to app/ui/style/olive-light/png/error.64.png
diff --git a/app/ui/icons/olive-light/ff.128.png b/app/ui/style/olive-light/png/ff.128.png
similarity index 100%
rename from app/ui/icons/olive-light/ff.128.png
rename to app/ui/style/olive-light/png/ff.128.png
diff --git a/app/ui/icons/olive-light/ff.16.png b/app/ui/style/olive-light/png/ff.16.png
similarity index 100%
rename from app/ui/icons/olive-light/ff.16.png
rename to app/ui/style/olive-light/png/ff.16.png
diff --git a/app/ui/icons/olive-light/ff.32.png b/app/ui/style/olive-light/png/ff.32.png
similarity index 100%
rename from app/ui/icons/olive-light/ff.32.png
rename to app/ui/style/olive-light/png/ff.32.png
diff --git a/app/ui/icons/olive-light/ff.64.png b/app/ui/style/olive-light/png/ff.64.png
similarity index 100%
rename from app/ui/icons/olive-light/ff.64.png
rename to app/ui/style/olive-light/png/ff.64.png
diff --git a/app/ui/icons/olive-light/folder.128.png b/app/ui/style/olive-light/png/folder.128.png
similarity index 100%
rename from app/ui/icons/olive-light/folder.128.png
rename to app/ui/style/olive-light/png/folder.128.png
diff --git a/app/ui/icons/olive-light/folder.16.png b/app/ui/style/olive-light/png/folder.16.png
similarity index 100%
rename from app/ui/icons/olive-light/folder.16.png
rename to app/ui/style/olive-light/png/folder.16.png
diff --git a/app/ui/icons/olive-light/folder.32.png b/app/ui/style/olive-light/png/folder.32.png
similarity index 100%
rename from app/ui/icons/olive-light/folder.32.png
rename to app/ui/style/olive-light/png/folder.32.png
diff --git a/app/ui/icons/olive-light/folder.64.png b/app/ui/style/olive-light/png/folder.64.png
similarity index 100%
rename from app/ui/icons/olive-light/folder.64.png
rename to app/ui/style/olive-light/png/folder.64.png
diff --git a/app/ui/icons/olive-light/hand.128.png b/app/ui/style/olive-light/png/hand.128.png
similarity index 100%
rename from app/ui/icons/olive-light/hand.128.png
rename to app/ui/style/olive-light/png/hand.128.png
diff --git a/app/ui/icons/olive-light/hand.16.png b/app/ui/style/olive-light/png/hand.16.png
similarity index 100%
rename from app/ui/icons/olive-light/hand.16.png
rename to app/ui/style/olive-light/png/hand.16.png
diff --git a/app/ui/icons/olive-light/hand.32.png b/app/ui/style/olive-light/png/hand.32.png
similarity index 100%
rename from app/ui/icons/olive-light/hand.32.png
rename to app/ui/style/olive-light/png/hand.32.png
diff --git a/app/ui/icons/olive-light/hand.64.png b/app/ui/style/olive-light/png/hand.64.png
similarity index 100%
rename from app/ui/icons/olive-light/hand.64.png
rename to app/ui/style/olive-light/png/hand.64.png
diff --git a/app/ui/icons/olive-light/iconview.128.png b/app/ui/style/olive-light/png/iconview.128.png
similarity index 100%
rename from app/ui/icons/olive-light/iconview.128.png
rename to app/ui/style/olive-light/png/iconview.128.png
diff --git a/app/ui/icons/olive-light/iconview.16.png b/app/ui/style/olive-light/png/iconview.16.png
similarity index 100%
rename from app/ui/icons/olive-light/iconview.16.png
rename to app/ui/style/olive-light/png/iconview.16.png
diff --git a/app/ui/icons/olive-light/iconview.32.png b/app/ui/style/olive-light/png/iconview.32.png
similarity index 100%
rename from app/ui/icons/olive-light/iconview.32.png
rename to app/ui/style/olive-light/png/iconview.32.png
diff --git a/app/ui/icons/olive-light/iconview.64.png b/app/ui/style/olive-light/png/iconview.64.png
similarity index 100%
rename from app/ui/icons/olive-light/iconview.64.png
rename to app/ui/style/olive-light/png/iconview.64.png
diff --git a/app/ui/icons/olive-light/imagesource.128.png b/app/ui/style/olive-light/png/imagesource.128.png
similarity index 100%
rename from app/ui/icons/olive-light/imagesource.128.png
rename to app/ui/style/olive-light/png/imagesource.128.png
diff --git a/app/ui/icons/olive-light/imagesource.16.png b/app/ui/style/olive-light/png/imagesource.16.png
similarity index 100%
rename from app/ui/icons/olive-light/imagesource.16.png
rename to app/ui/style/olive-light/png/imagesource.16.png
diff --git a/app/ui/icons/olive-light/imagesource.32.png b/app/ui/style/olive-light/png/imagesource.32.png
similarity index 100%
rename from app/ui/icons/olive-light/imagesource.32.png
rename to app/ui/style/olive-light/png/imagesource.32.png
diff --git a/app/ui/icons/olive-light/imagesource.64.png b/app/ui/style/olive-light/png/imagesource.64.png
similarity index 100%
rename from app/ui/icons/olive-light/imagesource.64.png
rename to app/ui/style/olive-light/png/imagesource.64.png
diff --git a/app/ui/icons/olive-light/italic.128.png b/app/ui/style/olive-light/png/italic.128.png
similarity index 100%
rename from app/ui/icons/olive-light/italic.128.png
rename to app/ui/style/olive-light/png/italic.128.png
diff --git a/app/ui/icons/olive-light/italic.16.png b/app/ui/style/olive-light/png/italic.16.png
similarity index 100%
rename from app/ui/icons/olive-light/italic.16.png
rename to app/ui/style/olive-light/png/italic.16.png
diff --git a/app/ui/icons/olive-light/italic.32.png b/app/ui/style/olive-light/png/italic.32.png
similarity index 100%
rename from app/ui/icons/olive-light/italic.32.png
rename to app/ui/style/olive-light/png/italic.32.png
diff --git a/app/ui/icons/olive-light/italic.64.png b/app/ui/style/olive-light/png/italic.64.png
similarity index 100%
rename from app/ui/icons/olive-light/italic.64.png
rename to app/ui/style/olive-light/png/italic.64.png
diff --git a/app/ui/icons/olive-light/justify-center.128.png b/app/ui/style/olive-light/png/justify-center.128.png
similarity index 100%
rename from app/ui/icons/olive-light/justify-center.128.png
rename to app/ui/style/olive-light/png/justify-center.128.png
diff --git a/app/ui/icons/olive-light/justify-center.16.png b/app/ui/style/olive-light/png/justify-center.16.png
similarity index 100%
rename from app/ui/icons/olive-light/justify-center.16.png
rename to app/ui/style/olive-light/png/justify-center.16.png
diff --git a/app/ui/icons/olive-light/justify-center.32.png b/app/ui/style/olive-light/png/justify-center.32.png
similarity index 100%
rename from app/ui/icons/olive-light/justify-center.32.png
rename to app/ui/style/olive-light/png/justify-center.32.png
diff --git a/app/ui/icons/olive-light/justify-center.64.png b/app/ui/style/olive-light/png/justify-center.64.png
similarity index 100%
rename from app/ui/icons/olive-light/justify-center.64.png
rename to app/ui/style/olive-light/png/justify-center.64.png
diff --git a/app/ui/icons/olive-light/listview.128.png b/app/ui/style/olive-light/png/listview.128.png
similarity index 100%
rename from app/ui/icons/olive-light/listview.128.png
rename to app/ui/style/olive-light/png/listview.128.png
diff --git a/app/ui/icons/olive-light/listview.16.png b/app/ui/style/olive-light/png/listview.16.png
similarity index 100%
rename from app/ui/icons/olive-light/listview.16.png
rename to app/ui/style/olive-light/png/listview.16.png
diff --git a/app/ui/icons/olive-light/listview.32.png b/app/ui/style/olive-light/png/listview.32.png
similarity index 100%
rename from app/ui/icons/olive-light/listview.32.png
rename to app/ui/style/olive-light/png/listview.32.png
diff --git a/app/ui/icons/olive-light/listview.64.png b/app/ui/style/olive-light/png/listview.64.png
similarity index 100%
rename from app/ui/icons/olive-light/listview.64.png
rename to app/ui/style/olive-light/png/listview.64.png
diff --git a/app/ui/icons/olive-light/magnet.128.png b/app/ui/style/olive-light/png/magnet.128.png
similarity index 100%
rename from app/ui/icons/olive-light/magnet.128.png
rename to app/ui/style/olive-light/png/magnet.128.png
diff --git a/app/ui/icons/olive-light/magnet.16.png b/app/ui/style/olive-light/png/magnet.16.png
similarity index 100%
rename from app/ui/icons/olive-light/magnet.16.png
rename to app/ui/style/olive-light/png/magnet.16.png
diff --git a/app/ui/icons/olive-light/magnet.32.png b/app/ui/style/olive-light/png/magnet.32.png
similarity index 100%
rename from app/ui/icons/olive-light/magnet.32.png
rename to app/ui/style/olive-light/png/magnet.32.png
diff --git a/app/ui/icons/olive-light/magnet.64.png b/app/ui/style/olive-light/png/magnet.64.png
similarity index 100%
rename from app/ui/icons/olive-light/magnet.64.png
rename to app/ui/style/olive-light/png/magnet.64.png
diff --git a/app/ui/icons/olive-light/new.128.png b/app/ui/style/olive-light/png/new.128.png
similarity index 100%
rename from app/ui/icons/olive-light/new.128.png
rename to app/ui/style/olive-light/png/new.128.png
diff --git a/app/ui/icons/olive-light/new.16.png b/app/ui/style/olive-light/png/new.16.png
similarity index 100%
rename from app/ui/icons/olive-light/new.16.png
rename to app/ui/style/olive-light/png/new.16.png
diff --git a/app/ui/icons/olive-light/new.32.png b/app/ui/style/olive-light/png/new.32.png
similarity index 100%
rename from app/ui/icons/olive-light/new.32.png
rename to app/ui/style/olive-light/png/new.32.png
diff --git a/app/ui/icons/olive-light/new.64.png b/app/ui/style/olive-light/png/new.64.png
similarity index 100%
rename from app/ui/icons/olive-light/new.64.png
rename to app/ui/style/olive-light/png/new.64.png
diff --git a/app/ui/icons/olive-light/next.128.png b/app/ui/style/olive-light/png/next.128.png
similarity index 100%
rename from app/ui/icons/olive-light/next.128.png
rename to app/ui/style/olive-light/png/next.128.png
diff --git a/app/ui/icons/olive-light/next.16.png b/app/ui/style/olive-light/png/next.16.png
similarity index 100%
rename from app/ui/icons/olive-light/next.16.png
rename to app/ui/style/olive-light/png/next.16.png
diff --git a/app/ui/icons/olive-light/next.32.png b/app/ui/style/olive-light/png/next.32.png
similarity index 100%
rename from app/ui/icons/olive-light/next.32.png
rename to app/ui/style/olive-light/png/next.32.png
diff --git a/app/ui/icons/olive-light/next.64.png b/app/ui/style/olive-light/png/next.64.png
similarity index 100%
rename from app/ui/icons/olive-light/next.64.png
rename to app/ui/style/olive-light/png/next.64.png
diff --git a/app/ui/icons/olive-light/open.128.png b/app/ui/style/olive-light/png/open.128.png
similarity index 100%
rename from app/ui/icons/olive-light/open.128.png
rename to app/ui/style/olive-light/png/open.128.png
diff --git a/app/ui/icons/olive-light/open.16.png b/app/ui/style/olive-light/png/open.16.png
similarity index 100%
rename from app/ui/icons/olive-light/open.16.png
rename to app/ui/style/olive-light/png/open.16.png
diff --git a/app/ui/icons/olive-light/open.32.png b/app/ui/style/olive-light/png/open.32.png
similarity index 100%
rename from app/ui/icons/olive-light/open.32.png
rename to app/ui/style/olive-light/png/open.32.png
diff --git a/app/ui/icons/olive-light/open.64.png b/app/ui/style/olive-light/png/open.64.png
similarity index 100%
rename from app/ui/icons/olive-light/open.64.png
rename to app/ui/style/olive-light/png/open.64.png
diff --git a/app/ui/icons/olive-light/pause.128.png b/app/ui/style/olive-light/png/pause.128.png
similarity index 100%
rename from app/ui/icons/olive-light/pause.128.png
rename to app/ui/style/olive-light/png/pause.128.png
diff --git a/app/ui/icons/olive-light/pause.16.png b/app/ui/style/olive-light/png/pause.16.png
similarity index 100%
rename from app/ui/icons/olive-light/pause.16.png
rename to app/ui/style/olive-light/png/pause.16.png
diff --git a/app/ui/icons/olive-light/pause.32.png b/app/ui/style/olive-light/png/pause.32.png
similarity index 100%
rename from app/ui/icons/olive-light/pause.32.png
rename to app/ui/style/olive-light/png/pause.32.png
diff --git a/app/ui/icons/olive-light/pause.64.png b/app/ui/style/olive-light/png/pause.64.png
similarity index 100%
rename from app/ui/icons/olive-light/pause.64.png
rename to app/ui/style/olive-light/png/pause.64.png
diff --git a/app/ui/icons/olive-light/play.128.png b/app/ui/style/olive-light/png/play.128.png
similarity index 100%
rename from app/ui/icons/olive-light/play.128.png
rename to app/ui/style/olive-light/png/play.128.png
diff --git a/app/ui/icons/olive-light/play.16.png b/app/ui/style/olive-light/png/play.16.png
similarity index 100%
rename from app/ui/icons/olive-light/play.16.png
rename to app/ui/style/olive-light/png/play.16.png
diff --git a/app/ui/icons/olive-light/play.32.png b/app/ui/style/olive-light/png/play.32.png
similarity index 100%
rename from app/ui/icons/olive-light/play.32.png
rename to app/ui/style/olive-light/png/play.32.png
diff --git a/app/ui/icons/olive-light/play.64.png b/app/ui/style/olive-light/png/play.64.png
similarity index 100%
rename from app/ui/icons/olive-light/play.64.png
rename to app/ui/style/olive-light/png/play.64.png
diff --git a/app/ui/icons/olive-light/prev.128.png b/app/ui/style/olive-light/png/prev.128.png
similarity index 100%
rename from app/ui/icons/olive-light/prev.128.png
rename to app/ui/style/olive-light/png/prev.128.png
diff --git a/app/ui/icons/olive-light/prev.16.png b/app/ui/style/olive-light/png/prev.16.png
similarity index 100%
rename from app/ui/icons/olive-light/prev.16.png
rename to app/ui/style/olive-light/png/prev.16.png
diff --git a/app/ui/icons/olive-light/prev.32.png b/app/ui/style/olive-light/png/prev.32.png
similarity index 100%
rename from app/ui/icons/olive-light/prev.32.png
rename to app/ui/style/olive-light/png/prev.32.png
diff --git a/app/ui/icons/olive-light/prev.64.png b/app/ui/style/olive-light/png/prev.64.png
similarity index 100%
rename from app/ui/icons/olive-light/prev.64.png
rename to app/ui/style/olive-light/png/prev.64.png
diff --git a/app/ui/icons/olive-light/razor.128.png b/app/ui/style/olive-light/png/razor.128.png
similarity index 100%
rename from app/ui/icons/olive-light/razor.128.png
rename to app/ui/style/olive-light/png/razor.128.png
diff --git a/app/ui/icons/olive-light/razor.16.png b/app/ui/style/olive-light/png/razor.16.png
similarity index 100%
rename from app/ui/icons/olive-light/razor.16.png
rename to app/ui/style/olive-light/png/razor.16.png
diff --git a/app/ui/icons/olive-light/razor.32.png b/app/ui/style/olive-light/png/razor.32.png
similarity index 100%
rename from app/ui/icons/olive-light/razor.32.png
rename to app/ui/style/olive-light/png/razor.32.png
diff --git a/app/ui/icons/olive-light/razor.64.png b/app/ui/style/olive-light/png/razor.64.png
similarity index 100%
rename from app/ui/icons/olive-light/razor.64.png
rename to app/ui/style/olive-light/png/razor.64.png
diff --git a/app/ui/icons/olive-light/record.128.png b/app/ui/style/olive-light/png/record.128.png
similarity index 100%
rename from app/ui/icons/olive-light/record.128.png
rename to app/ui/style/olive-light/png/record.128.png
diff --git a/app/ui/icons/olive-light/record.16.png b/app/ui/style/olive-light/png/record.16.png
similarity index 100%
rename from app/ui/icons/olive-light/record.16.png
rename to app/ui/style/olive-light/png/record.16.png
diff --git a/app/ui/icons/olive-light/record.32.png b/app/ui/style/olive-light/png/record.32.png
similarity index 100%
rename from app/ui/icons/olive-light/record.32.png
rename to app/ui/style/olive-light/png/record.32.png
diff --git a/app/ui/icons/olive-light/record.64.png b/app/ui/style/olive-light/png/record.64.png
similarity index 100%
rename from app/ui/icons/olive-light/record.64.png
rename to app/ui/style/olive-light/png/record.64.png
diff --git a/app/ui/icons/olive-light/redo.128.png b/app/ui/style/olive-light/png/redo.128.png
similarity index 100%
rename from app/ui/icons/olive-light/redo.128.png
rename to app/ui/style/olive-light/png/redo.128.png
diff --git a/app/ui/icons/olive-light/redo.16.png b/app/ui/style/olive-light/png/redo.16.png
similarity index 100%
rename from app/ui/icons/olive-light/redo.16.png
rename to app/ui/style/olive-light/png/redo.16.png
diff --git a/app/ui/icons/olive-light/redo.32.png b/app/ui/style/olive-light/png/redo.32.png
similarity index 100%
rename from app/ui/icons/olive-light/redo.32.png
rename to app/ui/style/olive-light/png/redo.32.png
diff --git a/app/ui/icons/olive-light/redo.64.png b/app/ui/style/olive-light/png/redo.64.png
similarity index 100%
rename from app/ui/icons/olive-light/redo.64.png
rename to app/ui/style/olive-light/png/redo.64.png
diff --git a/app/ui/icons/olive-light/rew.128.png b/app/ui/style/olive-light/png/rew.128.png
similarity index 100%
rename from app/ui/icons/olive-light/rew.128.png
rename to app/ui/style/olive-light/png/rew.128.png
diff --git a/app/ui/icons/olive-light/rew.16.png b/app/ui/style/olive-light/png/rew.16.png
similarity index 100%
rename from app/ui/icons/olive-light/rew.16.png
rename to app/ui/style/olive-light/png/rew.16.png
diff --git a/app/ui/icons/olive-light/rew.32.png b/app/ui/style/olive-light/png/rew.32.png
similarity index 100%
rename from app/ui/icons/olive-light/rew.32.png
rename to app/ui/style/olive-light/png/rew.32.png
diff --git a/app/ui/icons/olive-light/rew.64.png b/app/ui/style/olive-light/png/rew.64.png
similarity index 100%
rename from app/ui/icons/olive-light/rew.64.png
rename to app/ui/style/olive-light/png/rew.64.png
diff --git a/app/ui/icons/olive-light/ripple.128.png b/app/ui/style/olive-light/png/ripple.128.png
similarity index 100%
rename from app/ui/icons/olive-light/ripple.128.png
rename to app/ui/style/olive-light/png/ripple.128.png
diff --git a/app/ui/icons/olive-light/ripple.16.png b/app/ui/style/olive-light/png/ripple.16.png
similarity index 100%
rename from app/ui/icons/olive-light/ripple.16.png
rename to app/ui/style/olive-light/png/ripple.16.png
diff --git a/app/ui/icons/olive-light/ripple.32.png b/app/ui/style/olive-light/png/ripple.32.png
similarity index 100%
rename from app/ui/icons/olive-light/ripple.32.png
rename to app/ui/style/olive-light/png/ripple.32.png
diff --git a/app/ui/icons/olive-light/ripple.64.png b/app/ui/style/olive-light/png/ripple.64.png
similarity index 100%
rename from app/ui/icons/olive-light/ripple.64.png
rename to app/ui/style/olive-light/png/ripple.64.png
diff --git a/app/ui/icons/olive-light/rolling.128.png b/app/ui/style/olive-light/png/rolling.128.png
similarity index 100%
rename from app/ui/icons/olive-light/rolling.128.png
rename to app/ui/style/olive-light/png/rolling.128.png
diff --git a/app/ui/icons/olive-light/rolling.16.png b/app/ui/style/olive-light/png/rolling.16.png
similarity index 100%
rename from app/ui/icons/olive-light/rolling.16.png
rename to app/ui/style/olive-light/png/rolling.16.png
diff --git a/app/ui/icons/olive-light/rolling.32.png b/app/ui/style/olive-light/png/rolling.32.png
similarity index 100%
rename from app/ui/icons/olive-light/rolling.32.png
rename to app/ui/style/olive-light/png/rolling.32.png
diff --git a/app/ui/icons/olive-light/rolling.64.png b/app/ui/style/olive-light/png/rolling.64.png
similarity index 100%
rename from app/ui/icons/olive-light/rolling.64.png
rename to app/ui/style/olive-light/png/rolling.64.png
diff --git a/app/ui/icons/olive-light/save.128.png b/app/ui/style/olive-light/png/save.128.png
similarity index 100%
rename from app/ui/icons/olive-light/save.128.png
rename to app/ui/style/olive-light/png/save.128.png
diff --git a/app/ui/icons/olive-light/save.16.png b/app/ui/style/olive-light/png/save.16.png
similarity index 100%
rename from app/ui/icons/olive-light/save.16.png
rename to app/ui/style/olive-light/png/save.16.png
diff --git a/app/ui/icons/olive-light/save.32.png b/app/ui/style/olive-light/png/save.32.png
similarity index 100%
rename from app/ui/icons/olive-light/save.32.png
rename to app/ui/style/olive-light/png/save.32.png
diff --git a/app/ui/icons/olive-light/save.64.png b/app/ui/style/olive-light/png/save.64.png
similarity index 100%
rename from app/ui/icons/olive-light/save.64.png
rename to app/ui/style/olive-light/png/save.64.png
diff --git a/app/ui/icons/olive-light/sequence.128.png b/app/ui/style/olive-light/png/sequence.128.png
similarity index 100%
rename from app/ui/icons/olive-light/sequence.128.png
rename to app/ui/style/olive-light/png/sequence.128.png
diff --git a/app/ui/icons/olive-light/sequence.16.png b/app/ui/style/olive-light/png/sequence.16.png
similarity index 100%
rename from app/ui/icons/olive-light/sequence.16.png
rename to app/ui/style/olive-light/png/sequence.16.png
diff --git a/app/ui/icons/olive-light/sequence.32.png b/app/ui/style/olive-light/png/sequence.32.png
similarity index 100%
rename from app/ui/icons/olive-light/sequence.32.png
rename to app/ui/style/olive-light/png/sequence.32.png
diff --git a/app/ui/icons/olive-light/sequence.64.png b/app/ui/style/olive-light/png/sequence.64.png
similarity index 100%
rename from app/ui/icons/olive-light/sequence.64.png
rename to app/ui/style/olive-light/png/sequence.64.png
diff --git a/app/ui/icons/olive-light/slide.128.png b/app/ui/style/olive-light/png/slide.128.png
similarity index 100%
rename from app/ui/icons/olive-light/slide.128.png
rename to app/ui/style/olive-light/png/slide.128.png
diff --git a/app/ui/icons/olive-light/slide.16.png b/app/ui/style/olive-light/png/slide.16.png
similarity index 100%
rename from app/ui/icons/olive-light/slide.16.png
rename to app/ui/style/olive-light/png/slide.16.png
diff --git a/app/ui/icons/olive-light/slide.32.png b/app/ui/style/olive-light/png/slide.32.png
similarity index 100%
rename from app/ui/icons/olive-light/slide.32.png
rename to app/ui/style/olive-light/png/slide.32.png
diff --git a/app/ui/icons/olive-light/slide.64.png b/app/ui/style/olive-light/png/slide.64.png
similarity index 100%
rename from app/ui/icons/olive-light/slide.64.png
rename to app/ui/style/olive-light/png/slide.64.png
diff --git a/app/ui/icons/olive-light/slip.128.png b/app/ui/style/olive-light/png/slip.128.png
similarity index 100%
rename from app/ui/icons/olive-light/slip.128.png
rename to app/ui/style/olive-light/png/slip.128.png
diff --git a/app/ui/icons/olive-light/slip.16.png b/app/ui/style/olive-light/png/slip.16.png
similarity index 100%
rename from app/ui/icons/olive-light/slip.16.png
rename to app/ui/style/olive-light/png/slip.16.png
diff --git a/app/ui/icons/olive-light/slip.32.png b/app/ui/style/olive-light/png/slip.32.png
similarity index 100%
rename from app/ui/icons/olive-light/slip.32.png
rename to app/ui/style/olive-light/png/slip.32.png
diff --git a/app/ui/icons/olive-light/slip.64.png b/app/ui/style/olive-light/png/slip.64.png
similarity index 100%
rename from app/ui/icons/olive-light/slip.64.png
rename to app/ui/style/olive-light/png/slip.64.png
diff --git a/app/ui/icons/olive-light/transition-tool.128.png b/app/ui/style/olive-light/png/transition-tool.128.png
similarity index 100%
rename from app/ui/icons/olive-light/transition-tool.128.png
rename to app/ui/style/olive-light/png/transition-tool.128.png
diff --git a/app/ui/icons/olive-light/transition-tool.16.png b/app/ui/style/olive-light/png/transition-tool.16.png
similarity index 100%
rename from app/ui/icons/olive-light/transition-tool.16.png
rename to app/ui/style/olive-light/png/transition-tool.16.png
diff --git a/app/ui/icons/olive-light/transition-tool.32.png b/app/ui/style/olive-light/png/transition-tool.32.png
similarity index 100%
rename from app/ui/icons/olive-light/transition-tool.32.png
rename to app/ui/style/olive-light/png/transition-tool.32.png
diff --git a/app/ui/icons/olive-light/transition-tool.64.png b/app/ui/style/olive-light/png/transition-tool.64.png
similarity index 100%
rename from app/ui/icons/olive-light/transition-tool.64.png
rename to app/ui/style/olive-light/png/transition-tool.64.png
diff --git a/app/ui/icons/olive-light/treeview.128.png b/app/ui/style/olive-light/png/treeview.128.png
similarity index 100%
rename from app/ui/icons/olive-light/treeview.128.png
rename to app/ui/style/olive-light/png/treeview.128.png
diff --git a/app/ui/icons/olive-light/treeview.16.png b/app/ui/style/olive-light/png/treeview.16.png
similarity index 100%
rename from app/ui/icons/olive-light/treeview.16.png
rename to app/ui/style/olive-light/png/treeview.16.png
diff --git a/app/ui/icons/olive-light/treeview.32.png b/app/ui/style/olive-light/png/treeview.32.png
similarity index 100%
rename from app/ui/icons/olive-light/treeview.32.png
rename to app/ui/style/olive-light/png/treeview.32.png
diff --git a/app/ui/icons/olive-light/treeview.64.png b/app/ui/style/olive-light/png/treeview.64.png
similarity index 100%
rename from app/ui/icons/olive-light/treeview.64.png
rename to app/ui/style/olive-light/png/treeview.64.png
diff --git a/app/ui/icons/olive-light/tri-down.128.png b/app/ui/style/olive-light/png/tri-down.128.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-down.128.png
rename to app/ui/style/olive-light/png/tri-down.128.png
diff --git a/app/ui/icons/olive-light/tri-down.16.png b/app/ui/style/olive-light/png/tri-down.16.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-down.16.png
rename to app/ui/style/olive-light/png/tri-down.16.png
diff --git a/app/ui/icons/olive-light/tri-down.32.png b/app/ui/style/olive-light/png/tri-down.32.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-down.32.png
rename to app/ui/style/olive-light/png/tri-down.32.png
diff --git a/app/ui/icons/olive-light/tri-down.64.png b/app/ui/style/olive-light/png/tri-down.64.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-down.64.png
rename to app/ui/style/olive-light/png/tri-down.64.png
diff --git a/app/ui/icons/olive-light/tri-left.128.png b/app/ui/style/olive-light/png/tri-left.128.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-left.128.png
rename to app/ui/style/olive-light/png/tri-left.128.png
diff --git a/app/ui/icons/olive-light/tri-left.16.png b/app/ui/style/olive-light/png/tri-left.16.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-left.16.png
rename to app/ui/style/olive-light/png/tri-left.16.png
diff --git a/app/ui/icons/olive-light/tri-left.32.png b/app/ui/style/olive-light/png/tri-left.32.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-left.32.png
rename to app/ui/style/olive-light/png/tri-left.32.png
diff --git a/app/ui/icons/olive-light/tri-left.64.png b/app/ui/style/olive-light/png/tri-left.64.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-left.64.png
rename to app/ui/style/olive-light/png/tri-left.64.png
diff --git a/app/ui/icons/olive-light/tri-right.128.png b/app/ui/style/olive-light/png/tri-right.128.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-right.128.png
rename to app/ui/style/olive-light/png/tri-right.128.png
diff --git a/app/ui/icons/olive-light/tri-right.16.png b/app/ui/style/olive-light/png/tri-right.16.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-right.16.png
rename to app/ui/style/olive-light/png/tri-right.16.png
diff --git a/app/ui/icons/olive-light/tri-right.32.png b/app/ui/style/olive-light/png/tri-right.32.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-right.32.png
rename to app/ui/style/olive-light/png/tri-right.32.png
diff --git a/app/ui/icons/olive-light/tri-right.64.png b/app/ui/style/olive-light/png/tri-right.64.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-right.64.png
rename to app/ui/style/olive-light/png/tri-right.64.png
diff --git a/app/ui/icons/olive-light/tri-up.128.png b/app/ui/style/olive-light/png/tri-up.128.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-up.128.png
rename to app/ui/style/olive-light/png/tri-up.128.png
diff --git a/app/ui/icons/olive-light/tri-up.16.png b/app/ui/style/olive-light/png/tri-up.16.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-up.16.png
rename to app/ui/style/olive-light/png/tri-up.16.png
diff --git a/app/ui/icons/olive-light/tri-up.32.png b/app/ui/style/olive-light/png/tri-up.32.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-up.32.png
rename to app/ui/style/olive-light/png/tri-up.32.png
diff --git a/app/ui/icons/olive-light/tri-up.64.png b/app/ui/style/olive-light/png/tri-up.64.png
similarity index 100%
rename from app/ui/icons/olive-light/tri-up.64.png
rename to app/ui/style/olive-light/png/tri-up.64.png
diff --git a/app/ui/icons/olive-light/underline.128.png b/app/ui/style/olive-light/png/underline.128.png
similarity index 100%
rename from app/ui/icons/olive-light/underline.128.png
rename to app/ui/style/olive-light/png/underline.128.png
diff --git a/app/ui/icons/olive-light/underline.16.png b/app/ui/style/olive-light/png/underline.16.png
similarity index 100%
rename from app/ui/icons/olive-light/underline.16.png
rename to app/ui/style/olive-light/png/underline.16.png
diff --git a/app/ui/icons/olive-light/underline.32.png b/app/ui/style/olive-light/png/underline.32.png
similarity index 100%
rename from app/ui/icons/olive-light/underline.32.png
rename to app/ui/style/olive-light/png/underline.32.png
diff --git a/app/ui/icons/olive-light/underline.64.png b/app/ui/style/olive-light/png/underline.64.png
similarity index 100%
rename from app/ui/icons/olive-light/underline.64.png
rename to app/ui/style/olive-light/png/underline.64.png
diff --git a/app/ui/icons/olive-light/undo.128.png b/app/ui/style/olive-light/png/undo.128.png
similarity index 100%
rename from app/ui/icons/olive-light/undo.128.png
rename to app/ui/style/olive-light/png/undo.128.png
diff --git a/app/ui/icons/olive-light/undo.16.png b/app/ui/style/olive-light/png/undo.16.png
similarity index 100%
rename from app/ui/icons/olive-light/undo.16.png
rename to app/ui/style/olive-light/png/undo.16.png
diff --git a/app/ui/icons/olive-light/undo.32.png b/app/ui/style/olive-light/png/undo.32.png
similarity index 100%
rename from app/ui/icons/olive-light/undo.32.png
rename to app/ui/style/olive-light/png/undo.32.png
diff --git a/app/ui/icons/olive-light/undo.64.png b/app/ui/style/olive-light/png/undo.64.png
similarity index 100%
rename from app/ui/icons/olive-light/undo.64.png
rename to app/ui/style/olive-light/png/undo.64.png
diff --git a/app/ui/icons/olive-light/videosource.128.png b/app/ui/style/olive-light/png/videosource.128.png
similarity index 100%
rename from app/ui/icons/olive-light/videosource.128.png
rename to app/ui/style/olive-light/png/videosource.128.png
diff --git a/app/ui/icons/olive-light/videosource.16.png b/app/ui/style/olive-light/png/videosource.16.png
similarity index 100%
rename from app/ui/icons/olive-light/videosource.16.png
rename to app/ui/style/olive-light/png/videosource.16.png
diff --git a/app/ui/icons/olive-light/videosource.32.png b/app/ui/style/olive-light/png/videosource.32.png
similarity index 100%
rename from app/ui/icons/olive-light/videosource.32.png
rename to app/ui/style/olive-light/png/videosource.32.png
diff --git a/app/ui/icons/olive-light/videosource.64.png b/app/ui/style/olive-light/png/videosource.64.png
similarity index 100%
rename from app/ui/icons/olive-light/videosource.64.png
rename to app/ui/style/olive-light/png/videosource.64.png
diff --git a/app/ui/icons/olive-light/zoomin.128.png b/app/ui/style/olive-light/png/zoomin.128.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomin.128.png
rename to app/ui/style/olive-light/png/zoomin.128.png
diff --git a/app/ui/icons/olive-light/zoomin.16.png b/app/ui/style/olive-light/png/zoomin.16.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomin.16.png
rename to app/ui/style/olive-light/png/zoomin.16.png
diff --git a/app/ui/icons/olive-light/zoomin.32.png b/app/ui/style/olive-light/png/zoomin.32.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomin.32.png
rename to app/ui/style/olive-light/png/zoomin.32.png
diff --git a/app/ui/icons/olive-light/zoomin.64.png b/app/ui/style/olive-light/png/zoomin.64.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomin.64.png
rename to app/ui/style/olive-light/png/zoomin.64.png
diff --git a/app/ui/icons/olive-light/zoomout.128.png b/app/ui/style/olive-light/png/zoomout.128.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomout.128.png
rename to app/ui/style/olive-light/png/zoomout.128.png
diff --git a/app/ui/icons/olive-light/zoomout.16.png b/app/ui/style/olive-light/png/zoomout.16.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomout.16.png
rename to app/ui/style/olive-light/png/zoomout.16.png
diff --git a/app/ui/icons/olive-light/zoomout.32.png b/app/ui/style/olive-light/png/zoomout.32.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomout.32.png
rename to app/ui/style/olive-light/png/zoomout.32.png
diff --git a/app/ui/icons/olive-light/zoomout.64.png b/app/ui/style/olive-light/png/zoomout.64.png
similarity index 100%
rename from app/ui/icons/olive-light/zoomout.64.png
rename to app/ui/style/olive-light/png/zoomout.64.png
diff --git a/app/ui/style/css/olive-light.css b/app/ui/style/olive-light/style.css
similarity index 100%
rename from app/ui/style/css/olive-light.css
rename to app/ui/style/olive-light/style.css
diff --git a/app/ui/icons/olive-light/svg/add-button.svg b/app/ui/style/olive-light/svg/add-button.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/add-button.svg
rename to app/ui/style/olive-light/svg/add-button.svg
diff --git a/app/ui/icons/olive-light/svg/add-effect.svg b/app/ui/style/olive-light/svg/add-effect.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/add-effect.svg
rename to app/ui/style/olive-light/svg/add-effect.svg
diff --git a/app/ui/icons/olive-light/svg/add-transition.svg b/app/ui/style/olive-light/svg/add-transition.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/add-transition.svg
rename to app/ui/style/olive-light/svg/add-transition.svg
diff --git a/app/ui/icons/olive-light/svg/align-center.svg b/app/ui/style/olive-light/svg/align-center.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/align-center.svg
rename to app/ui/style/olive-light/svg/align-center.svg
diff --git a/app/ui/icons/olive-light/svg/align-left.svg b/app/ui/style/olive-light/svg/align-left.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/align-left.svg
rename to app/ui/style/olive-light/svg/align-left.svg
diff --git a/app/ui/icons/olive-light/svg/align-right.svg b/app/ui/style/olive-light/svg/align-right.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/align-right.svg
rename to app/ui/style/olive-light/svg/align-right.svg
diff --git a/app/ui/icons/olive-light/svg/arrow.svg b/app/ui/style/olive-light/svg/arrow.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/arrow.svg
rename to app/ui/style/olive-light/svg/arrow.svg
diff --git a/app/ui/icons/olive-light/svg/audiosource.svg b/app/ui/style/olive-light/svg/audiosource.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/audiosource.svg
rename to app/ui/style/olive-light/svg/audiosource.svg
diff --git a/app/ui/icons/olive-light/svg/beam.svg b/app/ui/style/olive-light/svg/beam.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/beam.svg
rename to app/ui/style/olive-light/svg/beam.svg
diff --git a/app/ui/icons/olive-light/svg/clock.svg b/app/ui/style/olive-light/svg/clock.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/clock.svg
rename to app/ui/style/olive-light/svg/clock.svg
diff --git a/app/ui/icons/olive-light/svg/convert-to-dark.sh b/app/ui/style/olive-light/svg/convert-to-dark.sh
similarity index 100%
rename from app/ui/icons/olive-light/svg/convert-to-dark.sh
rename to app/ui/style/olive-light/svg/convert-to-dark.sh
diff --git a/app/ui/icons/olive-light/svg/diamond.svg b/app/ui/style/olive-light/svg/diamond.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/diamond.svg
rename to app/ui/style/olive-light/svg/diamond.svg
diff --git a/app/ui/icons/olive-light/svg/dirup.svg b/app/ui/style/olive-light/svg/dirup.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/dirup.svg
rename to app/ui/style/olive-light/svg/dirup.svg
diff --git a/app/ui/icons/olive-light/svg/error.svg b/app/ui/style/olive-light/svg/error.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/error.svg
rename to app/ui/style/olive-light/svg/error.svg
diff --git a/app/ui/icons/olive-light/svg/ff.svg b/app/ui/style/olive-light/svg/ff.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/ff.svg
rename to app/ui/style/olive-light/svg/ff.svg
diff --git a/app/ui/icons/olive-light/svg/folder.svg b/app/ui/style/olive-light/svg/folder.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/folder.svg
rename to app/ui/style/olive-light/svg/folder.svg
diff --git a/app/ui/icons/olive-light/svg/hand.svg b/app/ui/style/olive-light/svg/hand.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/hand.svg
rename to app/ui/style/olive-light/svg/hand.svg
diff --git a/app/ui/icons/olive-light/svg/iconview.svg b/app/ui/style/olive-light/svg/iconview.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/iconview.svg
rename to app/ui/style/olive-light/svg/iconview.svg
diff --git a/app/ui/icons/olive-light/svg/imagesource.svg b/app/ui/style/olive-light/svg/imagesource.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/imagesource.svg
rename to app/ui/style/olive-light/svg/imagesource.svg
diff --git a/app/ui/icons/olive-light/svg/italic.svg b/app/ui/style/olive-light/svg/italic.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/italic.svg
rename to app/ui/style/olive-light/svg/italic.svg
diff --git a/app/ui/icons/olive-light/svg/justify-center.svg b/app/ui/style/olive-light/svg/justify-center.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/justify-center.svg
rename to app/ui/style/olive-light/svg/justify-center.svg
diff --git a/app/ui/icons/olive-light/svg/listview.svg b/app/ui/style/olive-light/svg/listview.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/listview.svg
rename to app/ui/style/olive-light/svg/listview.svg
diff --git a/app/ui/icons/olive-light/svg/magnet.svg b/app/ui/style/olive-light/svg/magnet.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/magnet.svg
rename to app/ui/style/olive-light/svg/magnet.svg
diff --git a/app/ui/icons/olive-light/svg/new.svg b/app/ui/style/olive-light/svg/new.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/new.svg
rename to app/ui/style/olive-light/svg/new.svg
diff --git a/app/ui/icons/olive-light/svg/next.svg b/app/ui/style/olive-light/svg/next.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/next.svg
rename to app/ui/style/olive-light/svg/next.svg
diff --git a/app/ui/icons/olive-light/svg/open.svg b/app/ui/style/olive-light/svg/open.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/open.svg
rename to app/ui/style/olive-light/svg/open.svg
diff --git a/app/ui/icons/olive-light/svg/pause.svg b/app/ui/style/olive-light/svg/pause.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/pause.svg
rename to app/ui/style/olive-light/svg/pause.svg
diff --git a/app/ui/icons/olive-light/svg/play.svg b/app/ui/style/olive-light/svg/play.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/play.svg
rename to app/ui/style/olive-light/svg/play.svg
diff --git a/app/ui/icons/olive-light/svg/prev.svg b/app/ui/style/olive-light/svg/prev.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/prev.svg
rename to app/ui/style/olive-light/svg/prev.svg
diff --git a/app/ui/icons/olive-light/svg/razor.svg b/app/ui/style/olive-light/svg/razor.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/razor.svg
rename to app/ui/style/olive-light/svg/razor.svg
diff --git a/app/ui/icons/olive-light/svg/record.svg b/app/ui/style/olive-light/svg/record.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/record.svg
rename to app/ui/style/olive-light/svg/record.svg
diff --git a/app/ui/icons/olive-light/svg/redo.svg b/app/ui/style/olive-light/svg/redo.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/redo.svg
rename to app/ui/style/olive-light/svg/redo.svg
diff --git a/app/ui/icons/olive-light/svg/rew.svg b/app/ui/style/olive-light/svg/rew.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/rew.svg
rename to app/ui/style/olive-light/svg/rew.svg
diff --git a/app/ui/icons/olive-light/svg/ripple.svg b/app/ui/style/olive-light/svg/ripple.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/ripple.svg
rename to app/ui/style/olive-light/svg/ripple.svg
diff --git a/app/ui/icons/olive-light/svg/rolling.svg b/app/ui/style/olive-light/svg/rolling.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/rolling.svg
rename to app/ui/style/olive-light/svg/rolling.svg
diff --git a/app/ui/icons/olive-light/svg/save.svg b/app/ui/style/olive-light/svg/save.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/save.svg
rename to app/ui/style/olive-light/svg/save.svg
diff --git a/app/ui/icons/olive-light/svg/sequence.svg b/app/ui/style/olive-light/svg/sequence.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/sequence.svg
rename to app/ui/style/olive-light/svg/sequence.svg
diff --git a/app/ui/icons/olive-light/svg/slide.svg b/app/ui/style/olive-light/svg/slide.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/slide.svg
rename to app/ui/style/olive-light/svg/slide.svg
diff --git a/app/ui/icons/olive-light/svg/slip.svg b/app/ui/style/olive-light/svg/slip.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/slip.svg
rename to app/ui/style/olive-light/svg/slip.svg
diff --git a/app/ui/icons/olive-light/svg/transition-tool.svg b/app/ui/style/olive-light/svg/transition-tool.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/transition-tool.svg
rename to app/ui/style/olive-light/svg/transition-tool.svg
diff --git a/app/ui/icons/olive-light/svg/treeview.svg b/app/ui/style/olive-light/svg/treeview.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/treeview.svg
rename to app/ui/style/olive-light/svg/treeview.svg
diff --git a/app/ui/icons/olive-light/svg/tri-down.svg b/app/ui/style/olive-light/svg/tri-down.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/tri-down.svg
rename to app/ui/style/olive-light/svg/tri-down.svg
diff --git a/app/ui/icons/olive-light/svg/tri-left.svg b/app/ui/style/olive-light/svg/tri-left.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/tri-left.svg
rename to app/ui/style/olive-light/svg/tri-left.svg
diff --git a/app/ui/icons/olive-light/svg/tri-right.svg b/app/ui/style/olive-light/svg/tri-right.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/tri-right.svg
rename to app/ui/style/olive-light/svg/tri-right.svg
diff --git a/app/ui/icons/olive-light/svg/tri-up.svg b/app/ui/style/olive-light/svg/tri-up.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/tri-up.svg
rename to app/ui/style/olive-light/svg/tri-up.svg
diff --git a/app/ui/icons/olive-light/svg/underline.svg b/app/ui/style/olive-light/svg/underline.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/underline.svg
rename to app/ui/style/olive-light/svg/underline.svg
diff --git a/app/ui/icons/olive-light/svg/undo.svg b/app/ui/style/olive-light/svg/undo.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/undo.svg
rename to app/ui/style/olive-light/svg/undo.svg
diff --git a/app/ui/icons/olive-light/svg/videosource.svg b/app/ui/style/olive-light/svg/videosource.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/videosource.svg
rename to app/ui/style/olive-light/svg/videosource.svg
diff --git a/app/ui/icons/olive-light/svg/zoomin.svg b/app/ui/style/olive-light/svg/zoomin.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/zoomin.svg
rename to app/ui/style/olive-light/svg/zoomin.svg
diff --git a/app/ui/icons/olive-light/svg/zoomout.svg b/app/ui/style/olive-light/svg/zoomout.svg
similarity index 100%
rename from app/ui/icons/olive-light/svg/zoomout.svg
rename to app/ui/style/olive-light/svg/zoomout.svg
diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp
index 7bad7b40a..f57d1bc01 100644
--- a/app/ui/style/style.cpp
+++ b/app/ui/style/style.cpp
@@ -31,13 +31,14 @@
 
 void olive::style::AppSetDefault()
 {
-  SetOliveStyle("olive-light");
+  // FIXME: Fixed theme, allow the user to set this in-app
+  SetOliveStyle("olive-dark");
 }
 
 void olive::style::SetOliveStyle(const QString &style_name)
 {
   // Set CSS style for this
-  QFile css_file(QString(":/css/%1.css").arg(style_name));
+  QFile css_file(QString(":/style/%1/style.css").arg(style_name));
 
   if (css_file.open(QFile::ReadOnly | QFile::Text)) {
     // Read in entire CSS from file and set as the application stylesheet