diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7131e14..045a297 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,71 +1,71 @@
 project(yakuake)
 
 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 set (QT_MIN_VERSION "5.2.0")
 
 find_package(ECM 1.2.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(FeatureSummary)
 
 ### Security concerns about sendText and runCommand dbus methods being public
 option(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS "yakuake: remove runCommand dbus methods" OFF)
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Svg)
 
 find_package(KF5 5.29 REQUIRED
     Archive
     Config
     CoreAddons
     Crash
     DBusAddons
     GlobalAccel
     I18n
     IconThemes
     KIO
     NewStuff
     Notifications
     NotifyConfig
     Parts
     WidgetsAddons
     WindowSystem
 )
 
 if(NOT APPLE)
   find_package(X11)
   set(HAVE_X11 ${X11_FOUND})
 
   if(X11_FOUND)
     find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
   endif(X11_FOUND)
 
   find_package(KF5Wayland 5.5 CONFIG)
   set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
 endif(NOT APPLE)
 
 add_definitions(
   -DQT_USE_QSTRINGBUILDER
   -DQT_NO_CAST_TO_ASCII
   -DQT_NO_CAST_FROM_ASCII
   -DQT_STRICT_ITERATORS
   -DQT_NO_URL_CAST_FROM_STRING
   -DQT_NO_CAST_FROM_BYTEARRAY
   -DQT_NO_SIGNALS_SLOTS_KEYWORDS
   -DQT_USE_FAST_OPERATOR_PLUS
 )
 
 configure_file(org.kde.yakuake.service.in
 	       ${CMAKE_CURRENT_BINARY_DIR}/org.kde.yakuake.service)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.yakuake.service
 	DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
 
 add_subdirectory(app)
 add_subdirectory(data)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/data/skins/default/CMakeLists.txt b/data/skins/default/CMakeLists.txt
index 999beb1..4db1f92 100644
--- a/data/skins/default/CMakeLists.txt
+++ b/data/skins/default/CMakeLists.txt
@@ -1,61 +1,36 @@
 install(FILES
     title.skin
     tabs.skin
-    icon.png
+    icon.svg
     DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/default)
 
 install(FILES
-    tabs/add_down.png
     tabs/add_down.svg
-    tabs/add_up.png
     tabs/add_up.svg
-    tabs/back_image.png
     tabs/back_image.svg
-    tabs/close_down.png
     tabs/close_down.svg
-    tabs/close_up.png
     tabs/close_up.svg
-    tabs/left_corner.png
     tabs/left_corner.svg
-    tabs/lock.png
     tabs/lock.svg
-    tabs/right_corner.png
     tabs/right_corner.svg
-    tabs/selected_back.png
     tabs/selected_back.svg
-    tabs/selected_left.png
     tabs/selected_left.svg
-    tabs/selected_right.png
     tabs/selected_right.svg
-    tabs/separator.png
     tabs/separator.svg
-    tabs/unselected_back.png
     tabs/unselected_back.svg
-    tabs/unselected_left.png
     tabs/unselected_left.svg
-    tabs/unselected_right.png
     tabs/unselected_right.svg
     DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/default/tabs)
 
 install(FILES
-    title/back.png
     title/back.svg
-    title/config_down.png
     title/config_down.svg
-    title/config_up.png
     title/config_up.svg
-    title/focus_down.png
     title/focus_down.svg
-    title/focus_over.png
     title/focus_over.svg
-    title/focus_up.png
     title/focus_up.svg
-    title/left.png
     title/left.svg
-    title/quit_down.png
     title/quit_down.svg
-    title/quit_up.png
     title/quit_up.svg
-    title/right.png
     title/right.svg
     DESTINATION ${DATA_INSTALL_DIR}/yakuake/skins/default/title)
diff --git a/data/skins/default/icon.png b/data/skins/default/icon.png
deleted file mode 100644
index 84203d9..0000000
Binary files a/data/skins/default/icon.png and /dev/null differ
diff --git a/data/skins/default/tabs.skin b/data/skins/default/tabs.skin
index 155efcd..0672b14 100644
--- a/data/skins/default/tabs.skin
+++ b/data/skins/default/tabs.skin
@@ -1,41 +1,41 @@
 [Description]
 Skin=Breeze
 Author=Andreas Kainz
 Email=kainz.a@gmail.com
-Icon=/icon.png
+Icon=/icon.svg
 
 [Tabs]
 x=22
 y=0
 red=239
 green=240
 blue=241
-separator_image=/tabs/separator.png
-selected_background=/tabs/selected_back.png
-selected_left_corner=/tabs/selected_left.png
-selected_right_corner=/tabs/selected_right.png
-unselected_background=/tabs/unselected_back.png
-unselected_left_corner=/tabs/selected_left.png
-unselected_right_corner=/tabs/selected_right.png
-prevent_closing_image=/tabs/lock.png
+separator_image=/tabs/separator.svg
+selected_background=/tabs/selected_back.svg
+selected_left_corner=/tabs/selected_left.svg
+selected_right_corner=/tabs/selected_right.svg
+unselected_background=/tabs/unselected_back.svg
+unselected_left_corner=/tabs/selected_left.svg
+unselected_right_corner=/tabs/selected_right.svg
+prevent_closing_image=/tabs/lock.svg
 prevent_closing_image_x=0
 prevent_closing_image_y=0
 
 [Background]
-back_image=/tabs/back_image.png
-left_corner=/tabs/left_corner.png
-right_corner=/tabs/right_corner.png
+back_image=/tabs/back_image.svg
+left_corner=/tabs/left_corner.svg
+right_corner=/tabs/right_corner.svg
 
 [PlusButton]
 x=0
 y=0
-up_image=/tabs/add_up.png
-over_image=/tabs/add_down.png
-down_image=/tabs/add_down.png
+up_image=/tabs/add_up.svg
+over_image=/tabs/add_down.svg
+down_image=/tabs/add_down.svg
 
 [MinusButton]
 x=22
 y=0
-up_image=/tabs/close_up.png
-over_image=/tabs/close_down.png
-down_image=/tabs/close_down.png
\ No newline at end of file
+up_image=/tabs/close_up.svg
+over_image=/tabs/close_down.svg
+down_image=/tabs/close_down.svg
diff --git a/data/skins/default/tabs/add_down.png b/data/skins/default/tabs/add_down.png
deleted file mode 100644
index 775e574..0000000
Binary files a/data/skins/default/tabs/add_down.png and /dev/null differ
diff --git a/data/skins/default/tabs/add_up.png b/data/skins/default/tabs/add_up.png
deleted file mode 100644
index 6736d81..0000000
Binary files a/data/skins/default/tabs/add_up.png and /dev/null differ
diff --git a/data/skins/default/tabs/back_image.png b/data/skins/default/tabs/back_image.png
deleted file mode 100644
index 27fe806..0000000
Binary files a/data/skins/default/tabs/back_image.png and /dev/null differ
diff --git a/data/skins/default/tabs/close_down.png b/data/skins/default/tabs/close_down.png
deleted file mode 100644
index e54f6f5..0000000
Binary files a/data/skins/default/tabs/close_down.png and /dev/null differ
diff --git a/data/skins/default/tabs/close_up.png b/data/skins/default/tabs/close_up.png
deleted file mode 100644
index 7f540ee..0000000
Binary files a/data/skins/default/tabs/close_up.png and /dev/null differ
diff --git a/data/skins/default/tabs/left_corner.png b/data/skins/default/tabs/left_corner.png
deleted file mode 100644
index 27fe806..0000000
Binary files a/data/skins/default/tabs/left_corner.png and /dev/null differ
diff --git a/data/skins/default/tabs/lock.png b/data/skins/default/tabs/lock.png
deleted file mode 100644
index 7443f40..0000000
Binary files a/data/skins/default/tabs/lock.png and /dev/null differ
diff --git a/data/skins/default/tabs/right_corner.png b/data/skins/default/tabs/right_corner.png
deleted file mode 100644
index 27fe806..0000000
Binary files a/data/skins/default/tabs/right_corner.png and /dev/null differ
diff --git a/data/skins/default/tabs/selected_back.png b/data/skins/default/tabs/selected_back.png
deleted file mode 100644
index 2a677f8..0000000
Binary files a/data/skins/default/tabs/selected_back.png and /dev/null differ
diff --git a/data/skins/default/tabs/selected_left.png b/data/skins/default/tabs/selected_left.png
deleted file mode 100644
index 2a677f8..0000000
Binary files a/data/skins/default/tabs/selected_left.png and /dev/null differ
diff --git a/data/skins/default/tabs/selected_right.png b/data/skins/default/tabs/selected_right.png
deleted file mode 100644
index 2a677f8..0000000
Binary files a/data/skins/default/tabs/selected_right.png and /dev/null differ
diff --git a/data/skins/default/tabs/separator.png b/data/skins/default/tabs/separator.png
deleted file mode 100644
index c2afc28..0000000
Binary files a/data/skins/default/tabs/separator.png and /dev/null differ
diff --git a/data/skins/default/tabs/unselected_back.png b/data/skins/default/tabs/unselected_back.png
deleted file mode 100644
index c2afc28..0000000
Binary files a/data/skins/default/tabs/unselected_back.png and /dev/null differ
diff --git a/data/skins/default/tabs/unselected_left.png b/data/skins/default/tabs/unselected_left.png
deleted file mode 100644
index c2afc28..0000000
Binary files a/data/skins/default/tabs/unselected_left.png and /dev/null differ
diff --git a/data/skins/default/tabs/unselected_right.png b/data/skins/default/tabs/unselected_right.png
deleted file mode 100644
index c2afc28..0000000
Binary files a/data/skins/default/tabs/unselected_right.png and /dev/null differ
diff --git a/data/skins/default/title.skin b/data/skins/default/title.skin
index 4c988b6..c5d46db 100644
--- a/data/skins/default/title.skin
+++ b/data/skins/default/title.skin
@@ -1,45 +1,45 @@
 [Description]
 Skin=Breeze
 Author=Andreas Kainz
 Email=kainz.a@gmail.com
 Icon=/icon.png
 
 [Border]
 red=61
 green=174
 blue=233
 width=2
 
 [Text]
 x=34
 y=20
 red=239
 green=240
 blue=241
 text=Drop-Down Terminal
 
 [Background]
-back_image=/title/back.png
-left_corner=/title/left.png
-right_corner=/title/right.png
+back_image=/title/back.svg
+left_corner=/title/left.svg
+right_corner=/title/right.svg
 
 [FocusButton]
 x=78
 y=0
-up_image=/title/focus_up.png
-over_image=/title/focus_over.png
-down_image=/title/focus_down.png
+up_image=/title/focus_up.svg
+over_image=/title/focus_over.svg
+down_image=/title/focus_down.svg
 
 [ConfigButton]
 x=53
 y=0
-up_image=/title/config_up.png
-over_image=/title/config_down.png
-down_image=/title/config_down.png
+up_image=/title/config_up.svg
+over_image=/title/config_down.svg
+down_image=/title/config_down.svg
 
 [QuitButton]
 x=30
 y=0
-up_image=/title/quit_up.png
-over_image=/title/quit_down.png
-down_image=/title/quit_down.png
+up_image=/title/quit_up.svg
+over_image=/title/quit_down.svg
+down_image=/title/quit_down.svg
diff --git a/data/skins/default/title/back.png b/data/skins/default/title/back.png
deleted file mode 100644
index abb1a80..0000000
Binary files a/data/skins/default/title/back.png and /dev/null differ
diff --git a/data/skins/default/title/config_down.png b/data/skins/default/title/config_down.png
deleted file mode 100644
index b17de03..0000000
Binary files a/data/skins/default/title/config_down.png and /dev/null differ
diff --git a/data/skins/default/title/config_up.png b/data/skins/default/title/config_up.png
deleted file mode 100644
index c4a2cc2..0000000
Binary files a/data/skins/default/title/config_up.png and /dev/null differ
diff --git a/data/skins/default/title/focus_down.png b/data/skins/default/title/focus_down.png
deleted file mode 100644
index f00fa28..0000000
Binary files a/data/skins/default/title/focus_down.png and /dev/null differ
diff --git a/data/skins/default/title/focus_over.png b/data/skins/default/title/focus_over.png
deleted file mode 100644
index 02e6f64..0000000
Binary files a/data/skins/default/title/focus_over.png and /dev/null differ
diff --git a/data/skins/default/title/focus_up.png b/data/skins/default/title/focus_up.png
deleted file mode 100644
index ee34d26..0000000
Binary files a/data/skins/default/title/focus_up.png and /dev/null differ
diff --git a/data/skins/default/title/left.png b/data/skins/default/title/left.png
deleted file mode 100644
index 7ce8a86..0000000
Binary files a/data/skins/default/title/left.png and /dev/null differ
diff --git a/data/skins/default/title/quit_down.png b/data/skins/default/title/quit_down.png
deleted file mode 100644
index a5066d3..0000000
Binary files a/data/skins/default/title/quit_down.png and /dev/null differ
diff --git a/data/skins/default/title/quit_up.png b/data/skins/default/title/quit_up.png
deleted file mode 100644
index 86aa88c..0000000
Binary files a/data/skins/default/title/quit_up.png and /dev/null differ
diff --git a/data/skins/default/title/right.png b/data/skins/default/title/right.png
deleted file mode 100644
index cdfc432..0000000
Binary files a/data/skins/default/title/right.png and /dev/null differ