diff --git a/lib-core.sh b/lib-core.sh
index 4f485511..9cbf0f16 100755
--- a/lib-core.sh
+++ b/lib-core.sh
@@ -45,6 +45,7 @@ DASH_TO_DOCK_DIR_ROOT="/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gma
 DASH_TO_DOCK_DIR_HOME="/home/${MY_USERNAME}/.local/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com"
 FIREFOX_SRC_DIR="${REPO_DIR}/src/other/firefox"
 FIREFOX_DIR_HOME="/home/${MY_USERNAME}/.mozilla/firefox"
+FIREFOX_THEME_DIR="/home/${MY_USERNAME}/.mozilla/firefox/firefox-themes"
 export WHITESUR_TMP_DIR="/tmp/WhiteSur.lock"
 
 if [[ -w "/" ]]; then
diff --git a/lib-install.sh b/lib-install.sh
index d0a9468c..cfed96d0 100755
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -176,6 +176,9 @@ install_theemy() {
   local TMP_DIR_T="${WHITESUR_TMP_DIR}/gtk-3.0${color}${opacity}${alt}${theme}"
   local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}"
 
+  local HDPI_TARGET_DIR="${dest}/${name}${color}-hdpi"
+  local XHDPI_TARGET_DIR="${dest}/${name}${color}-xhdpi"
+
   mkdir -p                                                                                    "${TARGET_DIR}"
   local desktop_entry="
   [Desktop Entry]
@@ -273,12 +276,22 @@ install_theemy() {
   cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}/"*".png"                                "${TARGET_DIR}/xfwm4"
   cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${TARGET_DIR}/xfwm4/themerc"
 
+  mkdir -p                                                                                    "${HDPI_TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}-hdpi/"*".png"                           "${HDPI_TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${HDPI_TARGET_DIR}/xfwm4/themerc"
+
+  mkdir -p                                                                                    "${XHDPI_TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}-xhdpi/"*".png"                          "${XHDPI_TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${XHDPI_TARGET_DIR}/xfwm4/themerc"
+
   mkdir -p                                                                                    "${TARGET_DIR}/plank"
   cp -r "${THEME_SRC_DIR}/other/plank/theme${color}/"*".theme"                                "${TARGET_DIR}/plank"
 }
 
 remove_packy() {
   rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})"
+  rm -rf "${dest}/${name}$(destify ${1})-hdpi"
+  rm -rf "${dest}/${name}$(destify ${1})-xhdpi"
 }
 
 ###############################################################################
@@ -385,7 +398,7 @@ revert_gdm_theme() {
 
 install_firefox_theme() {
   remove_firefox_theme
-  userify cp -rf "${FIREFOX_SRC_DIR}"                                                           "${FIREFOX_DIR_HOME}/WhiteSur-chrome"
+  userify cp -rf "${FIREFOX_SRC_DIR}"                                                           "${FIREFOX_THEME_DIR}"
   config_firefox
 }
 
@@ -394,7 +407,7 @@ config_firefox() {
 
   for d in "${FIREFOX_DIR_HOME}/"*"default"*; do
     rm -rf                                                                                      "${d}/chrome"
-    userify ln -sf "${FIREFOX_DIR_HOME}/WhiteSur-chrome"                                        "${d}/chrome"
+    userify ln -sf "${FIREFOX_THEME_DIR}"                                                       "${d}/chrome"
     userify echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >> "${d}/prefs.js"
     userify echo "user_pref(\"browser.tabs.drawInTitlebar\", true);" >>                         "${d}/prefs.js"
     userify echo "user_pref(\"browser.uidensity\", 0);" >>                                      "${d}/prefs.js"
@@ -404,14 +417,14 @@ config_firefox() {
 }
 
 edit_firefox_theme_prefs() {
-  [[ ! -d "${FIREFOX_DIR_HOME}/WhiteSur-chrome" ]] && install_firefox_theme ; config_firefox
-  ${EDITOR:-nano}                                                                               "${FIREFOX_DIR_HOME}/WhiteSur-chrome/userChrome.css"
-  ${EDITOR:-nano}                                                                               "${FIREFOX_DIR_HOME}/WhiteSur-chrome/customChrome.css"
+  [[ ! -d "${FIREFOX_THEME_DIR}" ]] && install_firefox_theme ; config_firefox
+  ${EDITOR:-nano}                                                                               "${FIREFOX_THEME_DIR}/userChrome.css"
+  ${EDITOR:-nano}                                                                               "${FIREFOX_THEME_DIR}/customChrome.css"
 }
 
 remove_firefox_theme() {
   rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
-  rm -rf "${FIREFOX_DIR_HOME}/WhiteSur-chrome"
+  rm -rf "${FIREFOX_THEME_DIR}"
 }
 
 ###############################################################################
diff --git a/src/assets/xfwm4/assets-dark-hdpi/bottom-active.png b/src/assets/xfwm4/assets-dark-hdpi/bottom-active.png
new file mode 100644
index 00000000..30a3fa70
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/bottom-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/bottom-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/bottom-inactive.png
new file mode 100644
index 00000000..30a3fa70
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/bottom-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/bottom-left-active.png b/src/assets/xfwm4/assets-dark-hdpi/bottom-left-active.png
new file mode 100644
index 00000000..1f999810
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/bottom-left-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/bottom-left-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/bottom-left-inactive.png
new file mode 100644
index 00000000..1f999810
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/bottom-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/bottom-right-active.png b/src/assets/xfwm4/assets-dark-hdpi/bottom-right-active.png
new file mode 100644
index 00000000..9d0138e9
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/bottom-right-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/bottom-right-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/bottom-right-inactive.png
new file mode 100644
index 00000000..2ed4e25a
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/bottom-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-active.png b/src/assets/xfwm4/assets-dark-hdpi/close-active.png
new file mode 100644
index 00000000..76e5ac61
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/close-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/close-inactive.png
new file mode 100644
index 00000000..da38bcaa
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/close-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png
new file mode 100644
index 00000000..65290b7d
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png
new file mode 100644
index 00000000..7e82c75f
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-active.png b/src/assets/xfwm4/assets-dark-hdpi/hide-active.png
new file mode 100644
index 00000000..00dbd7c9
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/hide-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/hide-inactive.png
new file mode 100644
index 00000000..da38bcaa
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/hide-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png
new file mode 100644
index 00000000..8b97b53f
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png
new file mode 100644
index 00000000..42fe6a82
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/left-active.png b/src/assets/xfwm4/assets-dark-hdpi/left-active.png
new file mode 100644
index 00000000..bbf44ceb
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/left-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/left-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/left-inactive.png
new file mode 100644
index 00000000..bbf44ceb
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png
new file mode 100644
index 00000000..1394e9a7
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-inactive.png
new file mode 100644
index 00000000..da38bcaa
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png
new file mode 100644
index 00000000..0cd37f07
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png
new file mode 100644
index 00000000..981c56e1
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png
new file mode 100644
index 00000000..1394e9a7
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-inactive.png
new file mode 100644
index 00000000..da38bcaa
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png
new file mode 100644
index 00000000..f3859afd
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png
new file mode 100644
index 00000000..1f4dd5fd
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/menu-active.png b/src/assets/xfwm4/assets-dark-hdpi/menu-active.png
new file mode 100644
index 00000000..60e136bc
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/menu-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/menu-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/menu-inactive.png
new file mode 100644
index 00000000..0dfc8134
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/menu-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/menu-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/menu-pressed.png
new file mode 100644
index 00000000..0275bd54
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/menu-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/right-active.png b/src/assets/xfwm4/assets-dark-hdpi/right-active.png
new file mode 100644
index 00000000..8ebbdd8d
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/right-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/right-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/right-inactive.png
new file mode 100644
index 00000000..8ebbdd8d
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/shade-active.png b/src/assets/xfwm4/assets-dark-hdpi/shade-active.png
new file mode 100644
index 00000000..c1afb5df
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/shade-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/shade-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/shade-inactive.png
new file mode 100644
index 00000000..13ef85b7
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/shade-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/shade-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/shade-pressed.png
new file mode 100644
index 00000000..7b39265a
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/shade-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/stick-active.png b/src/assets/xfwm4/assets-dark-hdpi/stick-active.png
new file mode 100644
index 00000000..f7cbcbd6
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/stick-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/stick-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/stick-inactive.png
new file mode 100644
index 00000000..78b38507
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/stick-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/stick-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/stick-pressed.png
new file mode 100644
index 00000000..43ee7d68
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/stick-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-1-active.png b/src/assets/xfwm4/assets-dark-hdpi/title-1-active.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-1-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-1-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/title-1-inactive.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-1-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-2-active.png b/src/assets/xfwm4/assets-dark-hdpi/title-2-active.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-2-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-2-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/title-2-inactive.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-2-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-3-active.png b/src/assets/xfwm4/assets-dark-hdpi/title-3-active.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-3-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-3-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/title-3-inactive.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-3-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-4-active.png b/src/assets/xfwm4/assets-dark-hdpi/title-4-active.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-4-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-4-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/title-4-inactive.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-4-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-5-active.png b/src/assets/xfwm4/assets-dark-hdpi/title-5-active.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-5-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/title-5-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/title-5-inactive.png
new file mode 100644
index 00000000..e7621f37
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/title-5-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/top-left-active.png b/src/assets/xfwm4/assets-dark-hdpi/top-left-active.png
new file mode 100644
index 00000000..24e363ae
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/top-left-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/top-left-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/top-left-inactive.png
new file mode 100644
index 00000000..24e363ae
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/top-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/top-right-active.png b/src/assets/xfwm4/assets-dark-hdpi/top-right-active.png
new file mode 100644
index 00000000..bfabf331
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/top-right-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-hdpi/top-right-inactive.png b/src/assets/xfwm4/assets-dark-hdpi/top-right-inactive.png
new file mode 100644
index 00000000..bfabf331
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-hdpi/top-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/bottom-active.png b/src/assets/xfwm4/assets-dark-xhdpi/bottom-active.png
new file mode 100644
index 00000000..b2eda668
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/bottom-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/bottom-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/bottom-inactive.png
new file mode 100644
index 00000000..b2eda668
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/bottom-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/bottom-left-active.png b/src/assets/xfwm4/assets-dark-xhdpi/bottom-left-active.png
new file mode 100644
index 00000000..b4b248f2
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/bottom-left-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/bottom-left-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/bottom-left-inactive.png
new file mode 100644
index 00000000..b4b248f2
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/bottom-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/bottom-right-active.png b/src/assets/xfwm4/assets-dark-xhdpi/bottom-right-active.png
new file mode 100644
index 00000000..9d20dcbf
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/bottom-right-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/bottom-right-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/bottom-right-inactive.png
new file mode 100644
index 00000000..47247158
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/bottom-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-active.png b/src/assets/xfwm4/assets-dark-xhdpi/close-active.png
new file mode 100644
index 00000000..02b9039c
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/close-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/close-inactive.png
new file mode 100644
index 00000000..d534a869
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/close-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png
new file mode 100644
index 00000000..fe82a3e0
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png
new file mode 100644
index 00000000..878ae898
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png
new file mode 100644
index 00000000..97e72ef2
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-inactive.png
new file mode 100644
index 00000000..d534a869
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/hide-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png
new file mode 100644
index 00000000..c2927669
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png
new file mode 100644
index 00000000..85d94c9f
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/left-active.png b/src/assets/xfwm4/assets-dark-xhdpi/left-active.png
new file mode 100644
index 00000000..adc32f81
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/left-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/left-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/left-inactive.png
new file mode 100644
index 00000000..adc32f81
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png
new file mode 100644
index 00000000..2ec58a1e
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-inactive.png
new file mode 100644
index 00000000..d534a869
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png
new file mode 100644
index 00000000..f6c2a88b
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png
new file mode 100644
index 00000000..5c0cf19b
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png
new file mode 100644
index 00000000..2ec58a1e
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-inactive.png
new file mode 100644
index 00000000..d534a869
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png
new file mode 100644
index 00000000..c896a61f
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png
new file mode 100644
index 00000000..a126be9b
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/menu-active.png b/src/assets/xfwm4/assets-dark-xhdpi/menu-active.png
new file mode 100644
index 00000000..405887c3
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/menu-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/menu-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/menu-inactive.png
new file mode 100644
index 00000000..1e2208d0
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/menu-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/menu-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/menu-pressed.png
new file mode 100644
index 00000000..8d63d525
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/menu-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/right-active.png b/src/assets/xfwm4/assets-dark-xhdpi/right-active.png
new file mode 100644
index 00000000..3871a025
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/right-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/right-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/right-inactive.png
new file mode 100644
index 00000000..3871a025
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/shade-active.png b/src/assets/xfwm4/assets-dark-xhdpi/shade-active.png
new file mode 100644
index 00000000..a2d2b7f3
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/shade-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/shade-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/shade-inactive.png
new file mode 100644
index 00000000..da9d6761
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/shade-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/shade-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/shade-pressed.png
new file mode 100644
index 00000000..27b6ae01
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/shade-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/stick-active.png b/src/assets/xfwm4/assets-dark-xhdpi/stick-active.png
new file mode 100644
index 00000000..bc6914f7
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/stick-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/stick-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/stick-inactive.png
new file mode 100644
index 00000000..e67f66fc
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/stick-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/stick-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/stick-pressed.png
new file mode 100644
index 00000000..8d043201
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/stick-pressed.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-1-active.png b/src/assets/xfwm4/assets-dark-xhdpi/title-1-active.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-1-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-1-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/title-1-inactive.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-1-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-2-active.png b/src/assets/xfwm4/assets-dark-xhdpi/title-2-active.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-2-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-2-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/title-2-inactive.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-2-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-3-active.png b/src/assets/xfwm4/assets-dark-xhdpi/title-3-active.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-3-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-3-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/title-3-inactive.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-3-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-4-active.png b/src/assets/xfwm4/assets-dark-xhdpi/title-4-active.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-4-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-4-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/title-4-inactive.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-4-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-5-active.png b/src/assets/xfwm4/assets-dark-xhdpi/title-5-active.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-5-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/title-5-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/title-5-inactive.png
new file mode 100644
index 00000000..46ac8808
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/title-5-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/top-left-active.png b/src/assets/xfwm4/assets-dark-xhdpi/top-left-active.png
new file mode 100644
index 00000000..fe5ff0bb
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/top-left-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/top-left-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/top-left-inactive.png
new file mode 100644
index 00000000..fe5ff0bb
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/top-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/top-right-active.png b/src/assets/xfwm4/assets-dark-xhdpi/top-right-active.png
new file mode 100644
index 00000000..953ebfe3
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/top-right-active.png differ
diff --git a/src/assets/xfwm4/assets-dark-xhdpi/top-right-inactive.png b/src/assets/xfwm4/assets-dark-xhdpi/top-right-inactive.png
new file mode 100644
index 00000000..953ebfe3
Binary files /dev/null and b/src/assets/xfwm4/assets-dark-xhdpi/top-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/bottom-active.png b/src/assets/xfwm4/assets-light-hdpi/bottom-active.png
new file mode 100644
index 00000000..12212a9f
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/bottom-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/bottom-inactive.png b/src/assets/xfwm4/assets-light-hdpi/bottom-inactive.png
new file mode 100644
index 00000000..12212a9f
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/bottom-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/bottom-left-active.png b/src/assets/xfwm4/assets-light-hdpi/bottom-left-active.png
new file mode 100644
index 00000000..8092b103
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/bottom-left-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/bottom-left-inactive.png b/src/assets/xfwm4/assets-light-hdpi/bottom-left-inactive.png
new file mode 100644
index 00000000..8092b103
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/bottom-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/bottom-right-active.png b/src/assets/xfwm4/assets-light-hdpi/bottom-right-active.png
new file mode 100644
index 00000000..b4695cf2
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/bottom-right-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/bottom-right-inactive.png b/src/assets/xfwm4/assets-light-hdpi/bottom-right-inactive.png
new file mode 100644
index 00000000..b4695cf2
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/bottom-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/close-active.png b/src/assets/xfwm4/assets-light-hdpi/close-active.png
new file mode 100644
index 00000000..0de6ebdb
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/close-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/close-inactive.png b/src/assets/xfwm4/assets-light-hdpi/close-inactive.png
new file mode 100644
index 00000000..6f6873bd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/close-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/close-prelight.png b/src/assets/xfwm4/assets-light-hdpi/close-prelight.png
new file mode 100644
index 00000000..3226f574
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/close-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/close-pressed.png b/src/assets/xfwm4/assets-light-hdpi/close-pressed.png
new file mode 100644
index 00000000..d2079e78
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/close-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/hide-active.png b/src/assets/xfwm4/assets-light-hdpi/hide-active.png
new file mode 100644
index 00000000..e78190ba
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/hide-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/hide-inactive.png b/src/assets/xfwm4/assets-light-hdpi/hide-inactive.png
new file mode 100644
index 00000000..6f6873bd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/hide-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/hide-prelight.png b/src/assets/xfwm4/assets-light-hdpi/hide-prelight.png
new file mode 100644
index 00000000..004efc74
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/hide-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/hide-pressed.png b/src/assets/xfwm4/assets-light-hdpi/hide-pressed.png
new file mode 100644
index 00000000..e8cbb6e1
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/hide-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/left-active.png b/src/assets/xfwm4/assets-light-hdpi/left-active.png
new file mode 100644
index 00000000..1cd51224
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/left-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/left-inactive.png b/src/assets/xfwm4/assets-light-hdpi/left-inactive.png
new file mode 100644
index 00000000..1cd51224
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-active.png b/src/assets/xfwm4/assets-light-hdpi/maximize-active.png
new file mode 100644
index 00000000..7dd7186c
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-inactive.png b/src/assets/xfwm4/assets-light-hdpi/maximize-inactive.png
new file mode 100644
index 00000000..6f6873bd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-prelight.png b/src/assets/xfwm4/assets-light-hdpi/maximize-prelight.png
new file mode 100644
index 00000000..47bc50ed
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-pressed.png b/src/assets/xfwm4/assets-light-hdpi/maximize-pressed.png
new file mode 100644
index 00000000..0dc44b10
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-active.png b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-active.png
new file mode 100644
index 00000000..7dd7186c
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-inactive.png b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-inactive.png
new file mode 100644
index 00000000..6f6873bd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-prelight.png
new file mode 100644
index 00000000..31484918
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-pressed.png
new file mode 100644
index 00000000..f77fa466
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/maximize-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/menu-active.png b/src/assets/xfwm4/assets-light-hdpi/menu-active.png
new file mode 100644
index 00000000..f4d462da
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/menu-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/menu-inactive.png b/src/assets/xfwm4/assets-light-hdpi/menu-inactive.png
new file mode 100644
index 00000000..f59e0351
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/menu-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/menu-pressed.png b/src/assets/xfwm4/assets-light-hdpi/menu-pressed.png
new file mode 100644
index 00000000..49322e7a
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/menu-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/right-active.png b/src/assets/xfwm4/assets-light-hdpi/right-active.png
new file mode 100644
index 00000000..c9110efd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/right-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/right-inactive.png b/src/assets/xfwm4/assets-light-hdpi/right-inactive.png
new file mode 100644
index 00000000..c9110efd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/shade-active.png b/src/assets/xfwm4/assets-light-hdpi/shade-active.png
new file mode 100644
index 00000000..f3e5ce08
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/shade-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/shade-inactive.png b/src/assets/xfwm4/assets-light-hdpi/shade-inactive.png
new file mode 100644
index 00000000..125b2547
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/shade-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/shade-pressed.png b/src/assets/xfwm4/assets-light-hdpi/shade-pressed.png
new file mode 100644
index 00000000..7905ae9f
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/shade-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/stick-active.png b/src/assets/xfwm4/assets-light-hdpi/stick-active.png
new file mode 100644
index 00000000..94d7c8bd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/stick-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/stick-inactive.png b/src/assets/xfwm4/assets-light-hdpi/stick-inactive.png
new file mode 100644
index 00000000..01d6eb64
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/stick-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/stick-pressed.png b/src/assets/xfwm4/assets-light-hdpi/stick-pressed.png
new file mode 100644
index 00000000..9692a6cb
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/stick-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-1-active.png b/src/assets/xfwm4/assets-light-hdpi/title-1-active.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-1-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-1-inactive.png b/src/assets/xfwm4/assets-light-hdpi/title-1-inactive.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-1-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-2-active.png b/src/assets/xfwm4/assets-light-hdpi/title-2-active.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-2-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-2-inactive.png b/src/assets/xfwm4/assets-light-hdpi/title-2-inactive.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-2-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-3-active.png b/src/assets/xfwm4/assets-light-hdpi/title-3-active.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-3-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-3-inactive.png b/src/assets/xfwm4/assets-light-hdpi/title-3-inactive.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-3-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-4-active.png b/src/assets/xfwm4/assets-light-hdpi/title-4-active.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-4-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-4-inactive.png b/src/assets/xfwm4/assets-light-hdpi/title-4-inactive.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-4-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-5-active.png b/src/assets/xfwm4/assets-light-hdpi/title-5-active.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-5-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/title-5-inactive.png b/src/assets/xfwm4/assets-light-hdpi/title-5-inactive.png
new file mode 100644
index 00000000..4c7f1844
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/title-5-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/top-left-active.png b/src/assets/xfwm4/assets-light-hdpi/top-left-active.png
new file mode 100644
index 00000000..f41f814b
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/top-left-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/top-left-inactive.png b/src/assets/xfwm4/assets-light-hdpi/top-left-inactive.png
new file mode 100644
index 00000000..f41f814b
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/top-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/top-right-active.png b/src/assets/xfwm4/assets-light-hdpi/top-right-active.png
new file mode 100644
index 00000000..39518378
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/top-right-active.png differ
diff --git a/src/assets/xfwm4/assets-light-hdpi/top-right-inactive.png b/src/assets/xfwm4/assets-light-hdpi/top-right-inactive.png
new file mode 100644
index 00000000..39518378
Binary files /dev/null and b/src/assets/xfwm4/assets-light-hdpi/top-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/bottom-active.png b/src/assets/xfwm4/assets-light-xhdpi/bottom-active.png
new file mode 100644
index 00000000..599e5310
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/bottom-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/bottom-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/bottom-inactive.png
new file mode 100644
index 00000000..599e5310
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/bottom-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/bottom-left-active.png b/src/assets/xfwm4/assets-light-xhdpi/bottom-left-active.png
new file mode 100644
index 00000000..659f27e6
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/bottom-left-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/bottom-left-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/bottom-left-inactive.png
new file mode 100644
index 00000000..659f27e6
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/bottom-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/bottom-right-active.png b/src/assets/xfwm4/assets-light-xhdpi/bottom-right-active.png
new file mode 100644
index 00000000..3a5d44fd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/bottom-right-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/bottom-right-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/bottom-right-inactive.png
new file mode 100644
index 00000000..3a5d44fd
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/bottom-right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/close-active.png b/src/assets/xfwm4/assets-light-xhdpi/close-active.png
new file mode 100644
index 00000000..70c23a42
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/close-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/close-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/close-inactive.png
new file mode 100644
index 00000000..1aa3543e
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/close-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/close-prelight.png b/src/assets/xfwm4/assets-light-xhdpi/close-prelight.png
new file mode 100644
index 00000000..57db6c47
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/close-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/close-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/close-pressed.png
new file mode 100644
index 00000000..ed5144ed
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/close-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/hide-active.png b/src/assets/xfwm4/assets-light-xhdpi/hide-active.png
new file mode 100644
index 00000000..ebdf8d89
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/hide-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/hide-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/hide-inactive.png
new file mode 100644
index 00000000..1aa3543e
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/hide-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/hide-prelight.png b/src/assets/xfwm4/assets-light-xhdpi/hide-prelight.png
new file mode 100644
index 00000000..dd4d1d7e
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/hide-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/hide-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/hide-pressed.png
new file mode 100644
index 00000000..77aa2e8b
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/hide-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/left-active.png b/src/assets/xfwm4/assets-light-xhdpi/left-active.png
new file mode 100644
index 00000000..d5ba4343
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/left-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/left-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/left-inactive.png
new file mode 100644
index 00000000..d5ba4343
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-active.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-active.png
new file mode 100644
index 00000000..404e0925
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-inactive.png
new file mode 100644
index 00000000..1aa3543e
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-prelight.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-prelight.png
new file mode 100644
index 00000000..90c676f9
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-pressed.png
new file mode 100644
index 00000000..61797922
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-active.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-active.png
new file mode 100644
index 00000000..404e0925
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-inactive.png
new file mode 100644
index 00000000..1aa3543e
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-prelight.png
new file mode 100644
index 00000000..8fa1b99a
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-pressed.png
new file mode 100644
index 00000000..9dd4dc63
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/maximize-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/menu-active.png b/src/assets/xfwm4/assets-light-xhdpi/menu-active.png
new file mode 100644
index 00000000..7628573f
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/menu-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/menu-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/menu-inactive.png
new file mode 100644
index 00000000..d775b74d
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/menu-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/menu-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/menu-pressed.png
new file mode 100644
index 00000000..243f5f23
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/menu-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/right-active.png b/src/assets/xfwm4/assets-light-xhdpi/right-active.png
new file mode 100644
index 00000000..54842fb2
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/right-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/right-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/right-inactive.png
new file mode 100644
index 00000000..54842fb2
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/right-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/shade-active.png b/src/assets/xfwm4/assets-light-xhdpi/shade-active.png
new file mode 100644
index 00000000..86702d3e
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/shade-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/shade-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/shade-inactive.png
new file mode 100644
index 00000000..9d22f66f
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/shade-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/shade-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/shade-pressed.png
new file mode 100644
index 00000000..5650a5fc
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/shade-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/stick-active.png b/src/assets/xfwm4/assets-light-xhdpi/stick-active.png
new file mode 100644
index 00000000..db0f1a6d
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/stick-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/stick-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/stick-inactive.png
new file mode 100644
index 00000000..5a5c34ff
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/stick-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/stick-pressed.png b/src/assets/xfwm4/assets-light-xhdpi/stick-pressed.png
new file mode 100644
index 00000000..8a52e69a
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/stick-pressed.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-1-active.png b/src/assets/xfwm4/assets-light-xhdpi/title-1-active.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-1-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-1-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/title-1-inactive.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-1-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-2-active.png b/src/assets/xfwm4/assets-light-xhdpi/title-2-active.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-2-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-2-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/title-2-inactive.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-2-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-3-active.png b/src/assets/xfwm4/assets-light-xhdpi/title-3-active.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-3-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-3-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/title-3-inactive.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-3-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-4-active.png b/src/assets/xfwm4/assets-light-xhdpi/title-4-active.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-4-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-4-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/title-4-inactive.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-4-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-5-active.png b/src/assets/xfwm4/assets-light-xhdpi/title-5-active.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-5-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/title-5-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/title-5-inactive.png
new file mode 100644
index 00000000..2994a251
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/title-5-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/top-left-active.png b/src/assets/xfwm4/assets-light-xhdpi/top-left-active.png
new file mode 100644
index 00000000..f2b39f58
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/top-left-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/top-left-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/top-left-inactive.png
new file mode 100644
index 00000000..f2b39f58
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/top-left-inactive.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/top-right-active.png b/src/assets/xfwm4/assets-light-xhdpi/top-right-active.png
new file mode 100644
index 00000000..4c734825
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/top-right-active.png differ
diff --git a/src/assets/xfwm4/assets-light-xhdpi/top-right-inactive.png b/src/assets/xfwm4/assets-light-xhdpi/top-right-inactive.png
new file mode 100644
index 00000000..4c734825
Binary files /dev/null and b/src/assets/xfwm4/assets-light-xhdpi/top-right-inactive.png differ
diff --git a/src/assets/xfwm4/render-assets.sh b/src/assets/xfwm4/render-assets.sh
index ff35e2c4..bda70f5f 100755
--- a/src/assets/xfwm4/render-assets.sh
+++ b/src/assets/xfwm4/render-assets.sh
@@ -7,15 +7,23 @@ SRC_FILE="assets-light.svg"
 DARK_SRC_FILE="assets-dark.svg"
 ASSETS_DIR="assets-light"
 DARK_ASSETS_DIR="assets-dark"
+HDPI_ASSETS_DIR="assets-light-hdpi"
+HDPI_DARK_ASSETS_DIR="assets-dark-hdpi"
+XHDPI_ASSETS_DIR="assets-light-xhdpi"
+XHDPI_DARK_ASSETS_DIR="assets-dark-xhdpi"
 
 INDEX="assets.txt"
 
-[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR
-[[ -d $DARK_ASSETS_DIR ]] && rm -rf $DARK_ASSETS_DIR
+#[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR
+#[[ -d $DARK_ASSETS_DIR ]] && rm -rf $DARK_ASSETS_DIR
 mkdir -p $ASSETS_DIR && mkdir -p $DARK_ASSETS_DIR
+mkdir -p $HDPI_ASSETS_DIR && mkdir -p $HDPI_DARK_ASSETS_DIR
+mkdir -p $XHDPI_ASSETS_DIR && mkdir -p $XHDPI_DARK_ASSETS_DIR
 
 for i in `cat $INDEX`
-do 
+do
+
+# Normal
 if [ -f $ASSETS_DIR/$i.png ]; then
     echo $ASSETS_DIR/$i.png exists.
 else
@@ -36,5 +44,53 @@ else
               --export-filename=$DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \
     && $OPTIPNG -o7 --quiet $DARK_ASSETS_DIR/$i.png 
 fi
+
+# HDPI
+if [ -f $HDPI_ASSETS_DIR/$i.png ]; then
+    echo $HDPI_ASSETS_DIR/$i.png exists.
+else
+    echo
+    echo Rendering $HDPI_ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-dpi=144 \
+              --export-filename=$HDPI_ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
+    && $OPTIPNG -o7 --quiet $HDPI_ASSETS_DIR/$i.png 
+fi
+if [ -f $HDPI_DARK_ASSETS_DIR/$i.png ]; then
+    echo $HDPI_DARK_ASSETS_DIR/$i.png exists.
+else
+    echo
+    echo Rendering $HDPI_DARK_ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-dpi=144 \
+              --export-filename=$HDPI_DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \
+    && $OPTIPNG -o7 --quiet $HDPI_DARK_ASSETS_DIR/$i.png 
+fi
+
+# XHDPI
+if [ -f $XHDPI_ASSETS_DIR/$i.png ]; then
+    echo $XHDPI_ASSETS_DIR/$i.png exists.
+else
+    echo
+    echo Rendering $XHDPI_ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-dpi=192 \
+              --export-filename=$XHDPI_ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
+    && $OPTIPNG -o7 --quiet $XHDPI_ASSETS_DIR/$i.png 
+fi
+if [ -f $XHDPI_DARK_ASSETS_DIR/$i.png ]; then
+    echo $XHDPI_DARK_ASSETS_DIR/$i.png exists.
+else
+    echo
+    echo Rendering $XHDPI_DARK_ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-dpi=192 \
+              --export-filename=$XHDPI_DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \
+    && $OPTIPNG -o7 --quiet $XHDPI_DARK_ASSETS_DIR/$i.png 
+fi
 done
 exit 0