diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp
index 0d61f5843..5c16000a5 100644
--- a/app/ui/icons/icons.cpp
+++ b/app/ui/icons/icons.cpp
@@ -84,6 +84,10 @@ QIcon icon::Diamond;
 QIcon icon::Plus;
 QIcon icon::Minus;
 QIcon icon::AddEffect;
+QIcon icon::EyeOpened;
+QIcon icon::EyeClosed;
+QIcon icon::LockOpened;
+QIcon icon::LockClosed;
 
 void icon::LoadAll(const QString& theme)
 {
@@ -146,6 +150,11 @@ void icon::LoadAll(const QString& theme)
   Plus = Create(theme, "plus");
   Minus = Create(theme, "minus");
   AddEffect = Create(theme, "add-effect");
+
+  EyeOpened = Create(theme, "eye-opened");
+  EyeClosed = Create(theme, "eye-closed");
+  LockOpened = Create(theme, "lock-opened");
+  LockClosed = Create(theme, "lock-closed");
 }
 
 QIcon icon::Create(const QString& theme, const QString &name)
diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h
index 1cd60e0f9..c3e330685 100644
--- a/app/ui/icons/icons.h
+++ b/app/ui/icons/icons.h
@@ -96,6 +96,10 @@ extern QIcon Diamond;
 extern QIcon Plus;
 extern QIcon Minus;
 extern QIcon AddEffect;
+extern QIcon EyeOpened;
+extern QIcon EyeClosed;
+extern QIcon LockOpened;
+extern QIcon LockClosed;
 
 /**
  * @brief Create an icon object loaded from file
diff --git a/app/ui/style/generate-style.sh b/app/ui/style/generate-style.sh
index 50ddb4db9..1fc2a897c 100755
--- a/app/ui/style/generate-style.sh
+++ b/app/ui/style/generate-style.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Olive - Non-Linear Video Editor
 # Copyright (C) 2021 Olive Team
@@ -32,22 +32,38 @@ OUTPUT_SIZES=( 16 32 64 128 )
 if [ $# -lt 1 ]
 then
   echo "Generates sized PNG icons from SVG files"
-  echo "Usage: $0 icon-pack-name"
+  echo "Usage: $0 [options] <icon-pack-name>"
   echo
   echo "Example: $0 olive-dark"
   echo
+  echo "Options:"
+  echo "  -l    Skip existing files (only create files that don't exist)"
   exit 1
 fi
 
-PACKNAME=$1
-SVGDIR=$1/svg
-PNGDIR=$1/png
+SKIP_EXISTING=0
+
+for var in "$@"
+do
+  if [ "$var" == "-l" ]
+  then
+    SKIP_EXISTING=1
+  fi
+done
+
+PACKNAME="${@: -1}"
+SVGDIR=$PACKNAME/svg
+PNGDIR=$PACKNAME/png
 
 mkdir -p $PNGDIR
 
 OutputPng() {
-  inkscape --export-filename $2.png --export-width $s --export-height $s $1
-  convert $2.png -alpha set -background none -channel A -evaluate multiply 0.25 +channel $2.disabled.png
+  if [ $SKIP_EXISTING -eq 0 ] || [ ! -f "$2.png" ]; then
+    inkscape --export-filename $2.png --export-width $s --export-height $s $1
+  fi
+  if [ $SKIP_EXISTING -eq 0 ] || [ ! -f "$2.disabled.png" ]; then
+    convert $2.png -alpha set -background none -channel A -evaluate multiply 0.25 +channel $2.disabled.png
+  fi
 }
 
 for f in $SVGDIR/*.svg
diff --git a/app/ui/style/olive-dark/olive-dark.qrc b/app/ui/style/olive-dark/olive-dark.qrc
deleted file mode 100644
index b9938f5fa..000000000
--- a/app/ui/style/olive-dark/olive-dark.qrc
+++ /dev/null
@@ -1,274 +0,0 @@
-<RCC>
-  <qresource prefix="/style/olive-dark">
-    <file>style.css</file>
-    <file>palette.ini</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-justify-all.16.png</file>
-    <file>png/align-justify-all.32.png</file>
-    <file>png/align-justify-all.64.png</file>
-    <file>png/align-justify-all.128.png</file>
-    <file>png/align-justify-center.16.png</file>
-    <file>png/align-justify-center.32.png</file>
-    <file>png/align-justify-center.64.png</file>
-    <file>png/align-justify-center.128.png</file>
-    <file>png/align-justify-left.16.png</file>
-    <file>png/align-justify-left.32.png</file>
-    <file>png/align-justify-left.64.png</file>
-    <file>png/align-justify-left.128.png</file>
-    <file>png/align-justify-right.16.png</file>
-    <file>png/align-justify-right.32.png</file>
-    <file>png/align-justify-right.64.png</file>
-    <file>png/align-justify-right.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/box.16.png</file>
-    <file>png/box.32.png</file>
-    <file>png/box.64.png</file>
-    <file>png/box.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/copy.16.png</file>
-    <file>png/copy.32.png</file>
-    <file>png/copy.64.png</file>
-    <file>png/copy.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/export.16.png</file>
-    <file>png/export.32.png</file>
-    <file>png/export.64.png</file>
-    <file>png/export.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/filter.16.png</file>
-    <file>png/filter.32.png</file>
-    <file>png/filter.64.png</file>
-    <file>png/filter.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/import.16.png</file>
-    <file>png/import.32.png</file>
-    <file>png/import.64.png</file>
-    <file>png/import.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/map.16.png</file>
-    <file>png/map.32.png</file>
-    <file>png/map.64.png</file>
-    <file>png/map.128.png</file>
-    <file>png/minus.16.png</file>
-    <file>png/minus.32.png</file>
-    <file>png/minus.64.png</file>
-    <file>png/minus.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/nodes_btt.16.png</file>
-    <file>png/nodes_btt.32.png</file>
-    <file>png/nodes_btt.64.png</file>
-    <file>png/nodes_btt.128.png</file>
-    <file>png/nodes_ltr.16.png</file>
-    <file>png/nodes_ltr.32.png</file>
-    <file>png/nodes_ltr.64.png</file>
-    <file>png/nodes_ltr.128.png</file>
-    <file>png/nodes_rtl.16.png</file>
-    <file>png/nodes_rtl.32.png</file>
-    <file>png/nodes_rtl.64.png</file>
-    <file>png/nodes_rtl.128.png</file>
-    <file>png/nodes_ttb.16.png</file>
-    <file>png/nodes_ttb.32.png</file>
-    <file>png/nodes_ttb.64.png</file>
-    <file>png/nodes_ttb.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/paste.16.png</file>
-    <file>png/paste.32.png</file>
-    <file>png/paste.64.png</file>
-    <file>png/paste.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/plus.16.png</file>
-    <file>png/plus.32.png</file>
-    <file>png/plus.64.png</file>
-    <file>png/plus.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/smooth_edges.16.png</file>
-    <file>png/smooth_edges.32.png</file>
-    <file>png/smooth_edges.64.png</file>
-    <file>png/smooth_edges.128.png</file>
-    <file>png/text-bold.16.png</file>
-    <file>png/text-bold.32.png</file>
-    <file>png/text-bold.64.png</file>
-    <file>png/text-bold.128.png</file>
-    <file>png/text-italic.16.png</file>
-    <file>png/text-italic.32.png</file>
-    <file>png/text-italic.64.png</file>
-    <file>png/text-italic.128.png</file>
-    <file>png/text-underline.16.png</file>
-    <file>png/text-underline.32.png</file>
-    <file>png/text-underline.64.png</file>
-    <file>png/text-underline.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/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/style/olive-dark/png/eye-closed.128.disabled.png b/app/ui/style/olive-dark/png/eye-closed.128.disabled.png
new file mode 100644
index 000000000..64232e150
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.128.png b/app/ui/style/olive-dark/png/eye-closed.128.png
new file mode 100644
index 000000000..fc39ebd68
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.128.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.16.disabled.png b/app/ui/style/olive-dark/png/eye-closed.16.disabled.png
new file mode 100644
index 000000000..9a7f7bce3
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.16.png b/app/ui/style/olive-dark/png/eye-closed.16.png
new file mode 100644
index 000000000..d62fd8819
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.16.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.32.disabled.png b/app/ui/style/olive-dark/png/eye-closed.32.disabled.png
new file mode 100644
index 000000000..41ab1b29f
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.32.png b/app/ui/style/olive-dark/png/eye-closed.32.png
new file mode 100644
index 000000000..225fe9958
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.32.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.64.disabled.png b/app/ui/style/olive-dark/png/eye-closed.64.disabled.png
new file mode 100644
index 000000000..6f7ea3d8a
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-closed.64.png b/app/ui/style/olive-dark/png/eye-closed.64.png
new file mode 100644
index 000000000..b11380eba
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.64.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.128.disabled.png b/app/ui/style/olive-dark/png/eye-opened.128.disabled.png
new file mode 100644
index 000000000..7948b1ba8
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.128.png b/app/ui/style/olive-dark/png/eye-opened.128.png
new file mode 100644
index 000000000..670183fe9
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.128.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.16.disabled.png b/app/ui/style/olive-dark/png/eye-opened.16.disabled.png
new file mode 100644
index 000000000..e76c9ad41
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.16.png b/app/ui/style/olive-dark/png/eye-opened.16.png
new file mode 100644
index 000000000..b694ff6e8
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.16.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.32.disabled.png b/app/ui/style/olive-dark/png/eye-opened.32.disabled.png
new file mode 100644
index 000000000..0782c06c4
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.32.png b/app/ui/style/olive-dark/png/eye-opened.32.png
new file mode 100644
index 000000000..cc92cdecb
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.32.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.64.disabled.png b/app/ui/style/olive-dark/png/eye-opened.64.disabled.png
new file mode 100644
index 000000000..e790d74a6
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye-opened.64.png b/app/ui/style/olive-dark/png/eye-opened.64.png
new file mode 100644
index 000000000..6d0668166
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-opened.64.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.128.disabled.png b/app/ui/style/olive-dark/png/lock-closed.128.disabled.png
new file mode 100644
index 000000000..27f47aff1
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.128.png b/app/ui/style/olive-dark/png/lock-closed.128.png
new file mode 100644
index 000000000..0f3259c7c
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.128.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.16.disabled.png b/app/ui/style/olive-dark/png/lock-closed.16.disabled.png
new file mode 100644
index 000000000..731218e01
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.16.png b/app/ui/style/olive-dark/png/lock-closed.16.png
new file mode 100644
index 000000000..a2b24f63a
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.16.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.32.disabled.png b/app/ui/style/olive-dark/png/lock-closed.32.disabled.png
new file mode 100644
index 000000000..6b0103111
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.32.png b/app/ui/style/olive-dark/png/lock-closed.32.png
new file mode 100644
index 000000000..f7206c0da
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.32.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.64.disabled.png b/app/ui/style/olive-dark/png/lock-closed.64.disabled.png
new file mode 100644
index 000000000..c559d8d58
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-closed.64.png b/app/ui/style/olive-dark/png/lock-closed.64.png
new file mode 100644
index 000000000..e02e5b771
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-closed.64.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.128.disabled.png b/app/ui/style/olive-dark/png/lock-opened.128.disabled.png
new file mode 100644
index 000000000..3c58f7462
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.128.png b/app/ui/style/olive-dark/png/lock-opened.128.png
new file mode 100644
index 000000000..438e76649
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.128.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.16.disabled.png b/app/ui/style/olive-dark/png/lock-opened.16.disabled.png
new file mode 100644
index 000000000..d58eb0b8c
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.16.png b/app/ui/style/olive-dark/png/lock-opened.16.png
new file mode 100644
index 000000000..fa41af876
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.16.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.32.disabled.png b/app/ui/style/olive-dark/png/lock-opened.32.disabled.png
new file mode 100644
index 000000000..4e55805ea
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.32.png b/app/ui/style/olive-dark/png/lock-opened.32.png
new file mode 100644
index 000000000..ddcf505b9
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.32.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.64.disabled.png b/app/ui/style/olive-dark/png/lock-opened.64.disabled.png
new file mode 100644
index 000000000..4c34add69
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/lock-opened.64.png b/app/ui/style/olive-dark/png/lock-opened.64.png
new file mode 100644
index 000000000..5a339a6d0
Binary files /dev/null and b/app/ui/style/olive-dark/png/lock-opened.64.png differ
diff --git a/app/ui/style/olive-dark/svg/eye-closed.svg b/app/ui/style/olive-dark/svg/eye-closed.svg
new file mode 100644
index 000000000..3788ff0c6
--- /dev/null
+++ b/app/ui/style/olive-dark/svg/eye-closed.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#ffffff"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#ffffff"
+       opacity="0.05098039"
+       empcolor="#ffffff"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)"
+     style="display:inline">
+    <path
+       id="path4656"
+       style="color:#ffffff;fill:#ffffff;fill-opacity:0.86000001;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+       d="M 7.1015625 10.367188 C 6.2133457 10.375998 5.343087 10.756748 4.7832031 11.505859 C 4.4418649 11.962562 4.1196032 12.420679 3.8164062 12.876953 C 2.7123562 14.53841 2.7123492 17.461582 3.8164062 19.123047 C 8.6392861 26.38087 18.033493 34 32 34 C 45.966507 34 55.360714 26.38087 60.183594 19.123047 C 61.287651 17.461582 61.287644 14.53841 60.183594 12.876953 C 59.880397 12.42068 59.558136 11.962562 59.216797 11.505859 C 58.221448 10.174106 56.244933 10.004959 54.931641 11.025391 C 53.618345 12.045823 53.476598 13.862092 54.458984 15.203125 C 54.650557 15.464637 54.834798 15.725479 55.011719 15.986328 C 55.012819 15.993598 55.014972 15.9925 55.015625 16 C 55.015025 16.00747 55.012819 16.006372 55.011719 16.013672 C 51.066507 21.830412 43.640889 28 32 28 C 20.359111 28 12.933493 21.830412 8.9882812 16.013672 C 8.9871719 16.006394 8.985028 16.007513 8.984375 16 C 8.985028 15.9925 8.9871713 15.993598 8.9882812 15.986328 C 9.1652021 15.725479 9.349443 15.464636 9.5410156 15.203125 C 10.523402 13.862092 10.383608 12.045823 9.0703125 11.025391 C 8.4957468 10.578952 7.7923978 10.360335 7.1015625 10.367188 z " />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-dark/svg/eye-opened.svg b/app/ui/style/olive-dark/svg/eye-opened.svg
new file mode 100644
index 000000000..88eaa089f
--- /dev/null
+++ b/app/ui/style/olive-dark/svg/eye-opened.svg
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#ffffff"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#ffffff"
+       opacity="0.05098039"
+       empcolor="#ffffff"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)"
+     style="display:inline">
+    <path
+       id="path3500"
+       style="fill:#ffffff;fill-opacity:0.86;stroke-width:10;stroke-linecap:round;stroke-linejoin:round"
+       d="M 32,-2 C 18.033441,-2 8.6386755,5.6197606 3.8157844,12.877609 2.7117308,14.539072 2.7117346,17.460936 3.8157952,19.122407 8.6386895,26.380251 18.033451,34 32,34 45.966557,34 55.361321,26.380242 60.184213,19.122395 61.288268,17.460931 61.288264,14.539061 60.184202,12.877588 55.361307,5.6197464 45.966546,-2 32,-2 Z m 0,4 C 39.731986,2 46,8.2680135 46,16 46,23.731986 39.731986,30 32,30 24.268014,30 18,23.731986 18,16 18,8.2680135 24.268014,2 32,2 Z"
+       class="UnoptimicedTransforms" />
+    <circle
+       style="fill:#ffffff;fill-opacity:0.86;stroke-width:10;stroke-linecap:round;stroke-linejoin:round"
+       id="path4005"
+       cx="32"
+       cy="16"
+       r="10" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-dark/svg/lock-closed.svg b/app/ui/style/olive-dark/svg/lock-closed.svg
new file mode 100644
index 000000000..a30ca276a
--- /dev/null
+++ b/app/ui/style/olive-dark/svg/lock-closed.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#ffffff"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#ffffff"
+       opacity="0.05098039"
+       empcolor="#ffffff"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="fill:#ffffff;fill-opacity:0.86;stroke-width:12.0001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.567442;stop-color:#ffffff"
+       id="rect4250"
+       width="48"
+       height="30"
+       x="8"
+       y="16"
+       sodipodi:type="rect"
+       d="m 12,16 h 40 a 4,4 45 0 1 4,4 v 22 a 4,4 135 0 1 -4,4 H 12 A 4,4 45 0 1 8,42 V 20 a 4,4 135 0 1 4,-4 z"
+       inkscape:path-effect="#path-effect4670" />
+    <path
+       id="path4304"
+       style="fill:none;fill-opacity:0.86;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.86;stop-color:#ffffff"
+       d="M 20,16.067244 V 11 c 0,-6.5299769 5.372584,-11.8235691 12,-11.8235691 6.627417,0 12,5.2935922 12,11.8235691 v 5.067244"
+       sodipodi:nodetypes="csssc" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-dark/svg/lock-opened.svg b/app/ui/style/olive-dark/svg/lock-opened.svg
new file mode 100644
index 000000000..b15275e41
--- /dev/null
+++ b/app/ui/style/olive-dark/svg/lock-opened.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#ffffff"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#ffffff"
+       opacity="0.05098039"
+       empcolor="#ffffff"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="fill:#ffffff;fill-opacity:0.86;stroke-width:12.0001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.567442;stop-color:#ffffff"
+       id="rect4250"
+       width="48"
+       height="30"
+       x="8"
+       y="16"
+       sodipodi:type="rect"
+       d="m 12,16 h 40 a 4,4 45 0 1 4,4 v 22 a 4,4 135 0 1 -4,4 H 12 A 4,4 45 0 1 8,42 V 20 a 4,4 135 0 1 4,-4 z"
+       inkscape:path-effect="#path-effect4670" />
+    <path
+       id="path4304"
+       style="fill:none;fill-opacity:0.86;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.86;stop-color:#ffffff"
+       d="M 20,7.067244 V 2 c 0,-6.5299769 5.372584,-11.8235691 12,-11.8235691 6.627417,0 12,5.2935922 12,11.8235691 v 14"
+       sodipodi:nodetypes="csssc" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-light/olive-light.qrc b/app/ui/style/olive-light/olive-light.qrc
deleted file mode 100644
index 73795aa99..000000000
--- a/app/ui/style/olive-light/olive-light.qrc
+++ /dev/null
@@ -1,274 +0,0 @@
-<RCC>
-  <qresource prefix="/style/olive-light">
-    <file>style.css</file>
-    <file>palette.ini</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-justify-all.16.png</file>
-    <file>png/align-justify-all.32.png</file>
-    <file>png/align-justify-all.64.png</file>
-    <file>png/align-justify-all.128.png</file>
-    <file>png/align-justify-center.16.png</file>
-    <file>png/align-justify-center.32.png</file>
-    <file>png/align-justify-center.64.png</file>
-    <file>png/align-justify-center.128.png</file>
-    <file>png/align-justify-left.16.png</file>
-    <file>png/align-justify-left.32.png</file>
-    <file>png/align-justify-left.64.png</file>
-    <file>png/align-justify-left.128.png</file>
-    <file>png/align-justify-right.16.png</file>
-    <file>png/align-justify-right.32.png</file>
-    <file>png/align-justify-right.64.png</file>
-    <file>png/align-justify-right.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/box.16.png</file>
-    <file>png/box.32.png</file>
-    <file>png/box.64.png</file>
-    <file>png/box.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/copy.16.png</file>
-    <file>png/copy.32.png</file>
-    <file>png/copy.64.png</file>
-    <file>png/copy.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/export.16.png</file>
-    <file>png/export.32.png</file>
-    <file>png/export.64.png</file>
-    <file>png/export.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/filter.16.png</file>
-    <file>png/filter.32.png</file>
-    <file>png/filter.64.png</file>
-    <file>png/filter.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/import.16.png</file>
-    <file>png/import.32.png</file>
-    <file>png/import.64.png</file>
-    <file>png/import.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/map.16.png</file>
-    <file>png/map.32.png</file>
-    <file>png/map.64.png</file>
-    <file>png/map.128.png</file>
-    <file>png/minus.16.png</file>
-    <file>png/minus.32.png</file>
-    <file>png/minus.64.png</file>
-    <file>png/minus.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/nodes_btt.16.png</file>
-    <file>png/nodes_btt.32.png</file>
-    <file>png/nodes_btt.64.png</file>
-    <file>png/nodes_btt.128.png</file>
-    <file>png/nodes_ltr.16.png</file>
-    <file>png/nodes_ltr.32.png</file>
-    <file>png/nodes_ltr.64.png</file>
-    <file>png/nodes_ltr.128.png</file>
-    <file>png/nodes_rtl.16.png</file>
-    <file>png/nodes_rtl.32.png</file>
-    <file>png/nodes_rtl.64.png</file>
-    <file>png/nodes_rtl.128.png</file>
-    <file>png/nodes_ttb.16.png</file>
-    <file>png/nodes_ttb.32.png</file>
-    <file>png/nodes_ttb.64.png</file>
-    <file>png/nodes_ttb.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/paste.16.png</file>
-    <file>png/paste.32.png</file>
-    <file>png/paste.64.png</file>
-    <file>png/paste.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/plus.16.png</file>
-    <file>png/plus.32.png</file>
-    <file>png/plus.64.png</file>
-    <file>png/plus.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/smooth_edges.16.png</file>
-    <file>png/smooth_edges.32.png</file>
-    <file>png/smooth_edges.64.png</file>
-    <file>png/smooth_edges.128.png</file>
-    <file>png/text-bold.16.png</file>
-    <file>png/text-bold.32.png</file>
-    <file>png/text-bold.64.png</file>
-    <file>png/text-bold.128.png</file>
-    <file>png/text-italic.16.png</file>
-    <file>png/text-italic.32.png</file>
-    <file>png/text-italic.64.png</file>
-    <file>png/text-italic.128.png</file>
-    <file>png/text-underline.16.png</file>
-    <file>png/text-underline.32.png</file>
-    <file>png/text-underline.64.png</file>
-    <file>png/text-underline.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/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/style/olive-light/png/eye-closed.128.disabled.png b/app/ui/style/olive-light/png/eye-closed.128.disabled.png
new file mode 100644
index 000000000..decf37590
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.128.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.128.png b/app/ui/style/olive-light/png/eye-closed.128.png
new file mode 100644
index 000000000..ce7ed0c90
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.128.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.16.disabled.png b/app/ui/style/olive-light/png/eye-closed.16.disabled.png
new file mode 100644
index 000000000..844864723
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.16.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.16.png b/app/ui/style/olive-light/png/eye-closed.16.png
new file mode 100644
index 000000000..9da421f66
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.16.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.32.disabled.png b/app/ui/style/olive-light/png/eye-closed.32.disabled.png
new file mode 100644
index 000000000..6f34bf1fe
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.32.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.32.png b/app/ui/style/olive-light/png/eye-closed.32.png
new file mode 100644
index 000000000..775e81a0e
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.32.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.64.disabled.png b/app/ui/style/olive-light/png/eye-closed.64.disabled.png
new file mode 100644
index 000000000..cde42cac5
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.64.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-closed.64.png b/app/ui/style/olive-light/png/eye-closed.64.png
new file mode 100644
index 000000000..58a0c9d11
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-closed.64.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.128.disabled.png b/app/ui/style/olive-light/png/eye-opened.128.disabled.png
new file mode 100644
index 000000000..2edaf1af1
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.128.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.128.png b/app/ui/style/olive-light/png/eye-opened.128.png
new file mode 100644
index 000000000..ea511c3cd
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.128.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.16.disabled.png b/app/ui/style/olive-light/png/eye-opened.16.disabled.png
new file mode 100644
index 000000000..b889d4f4e
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.16.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.16.png b/app/ui/style/olive-light/png/eye-opened.16.png
new file mode 100644
index 000000000..3e11a118d
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.16.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.32.disabled.png b/app/ui/style/olive-light/png/eye-opened.32.disabled.png
new file mode 100644
index 000000000..13b60e778
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.32.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.32.png b/app/ui/style/olive-light/png/eye-opened.32.png
new file mode 100644
index 000000000..78c2a7ffe
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.32.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.64.disabled.png b/app/ui/style/olive-light/png/eye-opened.64.disabled.png
new file mode 100644
index 000000000..81136b3d9
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.64.disabled.png differ
diff --git a/app/ui/style/olive-light/png/eye-opened.64.png b/app/ui/style/olive-light/png/eye-opened.64.png
new file mode 100644
index 000000000..bb285b7cf
Binary files /dev/null and b/app/ui/style/olive-light/png/eye-opened.64.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.128.disabled.png b/app/ui/style/olive-light/png/lock-closed.128.disabled.png
new file mode 100644
index 000000000..e1f96bbbf
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.128.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.128.png b/app/ui/style/olive-light/png/lock-closed.128.png
new file mode 100644
index 000000000..c6f012368
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.128.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.16.disabled.png b/app/ui/style/olive-light/png/lock-closed.16.disabled.png
new file mode 100644
index 000000000..516b96bce
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.16.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.16.png b/app/ui/style/olive-light/png/lock-closed.16.png
new file mode 100644
index 000000000..ec52ca5ce
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.16.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.32.disabled.png b/app/ui/style/olive-light/png/lock-closed.32.disabled.png
new file mode 100644
index 000000000..da0ce7f04
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.32.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.32.png b/app/ui/style/olive-light/png/lock-closed.32.png
new file mode 100644
index 000000000..e4c244669
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.32.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.64.disabled.png b/app/ui/style/olive-light/png/lock-closed.64.disabled.png
new file mode 100644
index 000000000..c19c807a2
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.64.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-closed.64.png b/app/ui/style/olive-light/png/lock-closed.64.png
new file mode 100644
index 000000000..3a6c19f59
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-closed.64.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.128.disabled.png b/app/ui/style/olive-light/png/lock-opened.128.disabled.png
new file mode 100644
index 000000000..cf3de7863
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.128.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.128.png b/app/ui/style/olive-light/png/lock-opened.128.png
new file mode 100644
index 000000000..0b934f698
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.128.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.16.disabled.png b/app/ui/style/olive-light/png/lock-opened.16.disabled.png
new file mode 100644
index 000000000..0c5a0016f
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.16.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.16.png b/app/ui/style/olive-light/png/lock-opened.16.png
new file mode 100644
index 000000000..df8209536
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.16.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.32.disabled.png b/app/ui/style/olive-light/png/lock-opened.32.disabled.png
new file mode 100644
index 000000000..8cb05af38
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.32.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.32.png b/app/ui/style/olive-light/png/lock-opened.32.png
new file mode 100644
index 000000000..992796261
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.32.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.64.disabled.png b/app/ui/style/olive-light/png/lock-opened.64.disabled.png
new file mode 100644
index 000000000..c455dbb0a
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.64.disabled.png differ
diff --git a/app/ui/style/olive-light/png/lock-opened.64.png b/app/ui/style/olive-light/png/lock-opened.64.png
new file mode 100644
index 000000000..bea866a6e
Binary files /dev/null and b/app/ui/style/olive-light/png/lock-opened.64.png differ
diff --git a/app/ui/style/olive-light/svg/eye-closed.svg b/app/ui/style/olive-light/svg/eye-closed.svg
new file mode 100644
index 000000000..02cd7d0b5
--- /dev/null
+++ b/app/ui/style/olive-light/svg/eye-closed.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#212121"
+     pagecolor="#ffffff"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#000000"
+       opacity="0.05098039"
+       empcolor="#000000"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)"
+     style="display:inline">
+    <path
+       id="path4656"
+       style="color:#000000;fill:#212121;fill-opacity:0.86000001;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+       d="M 7.1015625 10.367188 C 6.2133457 10.375998 5.343087 10.756748 4.7832031 11.505859 C 4.4418649 11.962562 4.1196032 12.420679 3.8164062 12.876953 C 2.7123562 14.53841 2.7123492 17.461582 3.8164062 19.123047 C 8.6392861 26.38087 18.033493 34 32 34 C 45.966507 34 55.360714 26.38087 60.183594 19.123047 C 61.287651 17.461582 61.287644 14.53841 60.183594 12.876953 C 59.880397 12.42068 59.558136 11.962562 59.216797 11.505859 C 58.221448 10.174106 56.244933 10.004959 54.931641 11.025391 C 53.618345 12.045823 53.476598 13.862092 54.458984 15.203125 C 54.650557 15.464637 54.834798 15.725479 55.011719 15.986328 C 55.012819 15.993598 55.014972 15.9925 55.015625 16 C 55.015025 16.00747 55.012819 16.006372 55.011719 16.013672 C 51.066507 21.830412 43.640889 28 32 28 C 20.359111 28 12.933493 21.830412 8.9882812 16.013672 C 8.9871719 16.006394 8.985028 16.007513 8.984375 16 C 8.985028 15.9925 8.9871713 15.993598 8.9882812 15.986328 C 9.1652021 15.725479 9.349443 15.464636 9.5410156 15.203125 C 10.523402 13.862092 10.383608 12.045823 9.0703125 11.025391 C 8.4957468 10.578952 7.7923978 10.360335 7.1015625 10.367188 z " />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-light/svg/eye-opened.svg b/app/ui/style/olive-light/svg/eye-opened.svg
new file mode 100644
index 000000000..a8b4eb2dd
--- /dev/null
+++ b/app/ui/style/olive-light/svg/eye-opened.svg
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#212121"
+     pagecolor="#ffffff"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#000000"
+       opacity="0.05098039"
+       empcolor="#000000"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)"
+     style="display:inline">
+    <path
+       id="path3500"
+       style="fill:#212121;fill-opacity:0.86;stroke-width:10;stroke-linecap:round;stroke-linejoin:round"
+       d="M 32,-2 C 18.033441,-2 8.6386755,5.6197606 3.8157844,12.877609 2.7117308,14.539072 2.7117346,17.460936 3.8157952,19.122407 8.6386895,26.380251 18.033451,34 32,34 45.966557,34 55.361321,26.380242 60.184213,19.122395 61.288268,17.460931 61.288264,14.539061 60.184202,12.877588 55.361307,5.6197464 45.966546,-2 32,-2 Z m 0,4 C 39.731986,2 46,8.2680135 46,16 46,23.731986 39.731986,30 32,30 24.268014,30 18,23.731986 18,16 18,8.2680135 24.268014,2 32,2 Z"
+       class="UnoptimicedTransforms" />
+    <circle
+       style="fill:#212121;fill-opacity:0.86;stroke-width:10;stroke-linecap:round;stroke-linejoin:round"
+       id="path4005"
+       cx="32"
+       cy="16"
+       r="10" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-light/svg/lock-closed.svg b/app/ui/style/olive-light/svg/lock-closed.svg
new file mode 100644
index 000000000..7a9c20cd6
--- /dev/null
+++ b/app/ui/style/olive-light/svg/lock-closed.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#212121"
+     pagecolor="#ffffff"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#000000"
+       opacity="0.05098039"
+       empcolor="#000000"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="fill:#212121;fill-opacity:0.86;stroke-width:12.0001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.567442;stop-color:#000000"
+       id="rect4250"
+       width="48"
+       height="30"
+       x="8"
+       y="16"
+       sodipodi:type="rect"
+       d="m 12,16 h 40 a 4,4 45 0 1 4,4 v 22 a 4,4 135 0 1 -4,4 H 12 A 4,4 45 0 1 8,42 V 20 a 4,4 135 0 1 4,-4 z"
+       inkscape:path-effect="#path-effect4670" />
+    <path
+       id="path4304"
+       style="fill:none;fill-opacity:0.86;stroke:#212121;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.86;stop-color:#000000"
+       d="M 20,16.067244 V 11 c 0,-6.5299769 5.372584,-11.8235691 12,-11.8235691 6.627417,0 12,5.2935922 12,11.8235691 v 5.067244"
+       sodipodi:nodetypes="csssc" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-light/svg/lock-opened.svg b/app/ui/style/olive-light/svg/lock-opened.svg
new file mode 100644
index 000000000..51dd9c23c
--- /dev/null
+++ b/app/ui/style/olive-light/svg/lock-opened.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="export.svg"
+   inkscape:version="1.2-dev (217ad3d, 2021-07-13)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="./export.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="31.957503"
+     inkscape:zoom="11.765625"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#212121"
+     pagecolor="#ffffff"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:lockguides="true"
+     guidecolor="#ff0000"
+     guideopacity="0.30196078">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_pixels"
+       color="#000000"
+       opacity="0.05098039"
+       empcolor="#000000"
+       empopacity="0.10196078"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       enabled="true" />
+    <sodipodi:guide
+       position="2,64"
+       orientation="1,0"
+       id="guide6912"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="62,64"
+       orientation="1,0"
+       id="guide6914"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,62"
+       orientation="0,-1"
+       id="guide6916"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="0,2"
+       orientation="0,-1"
+       id="guide6918"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="0,-1"
+       id="guide6920"
+       inkscape:locked="true" />
+    <sodipodi:guide
+       position="32,32"
+       orientation="1,0"
+       id="guide6922"
+       inkscape:locked="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Design"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="fill:#212121;fill-opacity:0.86;stroke-width:12.0001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.567442;stop-color:#000000"
+       id="rect4250"
+       width="48"
+       height="30"
+       x="8"
+       y="16"
+       sodipodi:type="rect"
+       d="m 12,16 h 40 a 4,4 45 0 1 4,4 v 22 a 4,4 135 0 1 -4,4 H 12 A 4,4 45 0 1 8,42 V 20 a 4,4 135 0 1 4,-4 z"
+       inkscape:path-effect="#path-effect4670" />
+    <path
+       id="path4304"
+       style="fill:none;fill-opacity:0.86;stroke:#212121;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.86;stop-color:#000000"
+       d="M 20,7.067244 V 2 c 0,-6.5299769 5.372584,-11.8235691 12,-11.8235691 6.627417,0 12,5.2935922 12,11.8235691 v 14"
+       sodipodi:nodetypes="csssc" />
+  </g>
+</svg>
diff --git a/app/widget/timelinewidget/trackview/trackviewitem.cpp b/app/widget/timelinewidget/trackview/trackviewitem.cpp
index e62b4321d..2e860a2ae 100644
--- a/app/widget/timelinewidget/trackview/trackviewitem.cpp
+++ b/app/widget/timelinewidget/trackview/trackviewitem.cpp
@@ -28,6 +28,7 @@
 #include <QtMath>
 
 #include "core.h"
+#include "ui/icons/icons.h"
 #include "widget/menu/menu.h"
 #include "widget/timelinewidget/undo/timelineundogeneral.h"
 
@@ -56,15 +57,21 @@ TrackViewItem::TrackViewItem(Track* track, QWidget *parent) :
   connect(line_edit_, &FocusableLineEdit::Cancelled, this, &TrackViewItem::LineEditCancelled);
   stack_->addWidget(line_edit_);
 
-  mute_button_ = CreateMSLButton(tr("M"), Qt::red);
+  mute_button_ = CreateMSLButton(Qt::red);
+  mute_button_->setChecked(track->IsMuted());
+  UpdateMuteButton(track->IsMuted());
   connect(mute_button_, &QPushButton::toggled, track_, &Track::SetMuted);
+  connect(mute_button_, &QPushButton::toggled, this, &TrackViewItem::UpdateMuteButton);
   layout->addWidget(mute_button_);
 
   /*solo_button_ = CreateMSLButton(tr("S"), Qt::yellow);
   layout->addWidget(solo_button_);*/
 
-  lock_button_ = CreateMSLButton(tr("L"), Qt::gray);
+  lock_button_ = CreateMSLButton(Qt::gray);
+  lock_button_->setChecked(track->IsLocked());
+  UpdateLockButton(track->IsLocked());
   connect(lock_button_, &QPushButton::toggled, track_, &Track::SetLocked);
+  connect(lock_button_, &QPushButton::toggled, this, &TrackViewItem::UpdateLockButton);
   layout->addWidget(lock_button_);
 
   setMinimumHeight(mute_button_->height());
@@ -74,9 +81,9 @@ TrackViewItem::TrackViewItem(Track* track, QWidget *parent) :
   connect(this, &QWidget::customContextMenuRequested, this, &TrackViewItem::ShowContextMenu);
 }
 
-QPushButton *TrackViewItem::CreateMSLButton(const QString& text, const QColor& checked_color) const
+QPushButton *TrackViewItem::CreateMSLButton(const QColor& checked_color) const
 {
-  QPushButton* button = new QPushButton(text);
+  QPushButton* button = new QPushButton();
   button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
   button->setCheckable(true);
   button->setStyleSheet(QStringLiteral("QPushButton::checked { background: %1; }").arg(checked_color.name()));
@@ -169,4 +176,14 @@ void TrackViewItem::DeleteAllEmptyTracks()
   }
 }
 
+void TrackViewItem::UpdateMuteButton(bool e)
+{
+  mute_button_->setIcon(e ? icon::EyeClosed : icon::EyeOpened);
+}
+
+void TrackViewItem::UpdateLockButton(bool e)
+{
+  lock_button_->setIcon(e ? icon::LockClosed : icon::LockOpened);
+}
+
 }
diff --git a/app/widget/timelinewidget/trackview/trackviewitem.h b/app/widget/timelinewidget/trackview/trackviewitem.h
index 9d1c04506..000a562f0 100644
--- a/app/widget/timelinewidget/trackview/trackviewitem.h
+++ b/app/widget/timelinewidget/trackview/trackviewitem.h
@@ -39,7 +39,7 @@ public:
                 QWidget* parent = nullptr);
 
 private:
-  QPushButton* CreateMSLButton(const QString &text, const QColor &checked_color) const;
+  QPushButton* CreateMSLButton(const QColor &checked_color) const;
 
   QStackedWidget* stack_;
 
@@ -67,6 +67,10 @@ private slots:
 
   void DeleteAllEmptyTracks();
 
+  void UpdateMuteButton(bool e);
+
+  void UpdateLockButton(bool e);
+
 };
 
 }