diff --git a/bspwm/.Xresources b/bspwm/.Xresources
index cdb74b8..712ce47 100644
--- a/bspwm/.Xresources
+++ b/bspwm/.Xresources
@@ -1,12 +1,11 @@
 #if HEIGHT == 2160
 Xft.dpi: 160
 Xcursor.size: 48
-#define EM_FONT Iosevka:pixelsize=30:antialias=true:autohint=true
 #else
-#define EM_FONT Iosevka:pixelsize=22:antialias=true:autohint=true
+Xft.dpi: 107
 #endif
 
-emacs.font: EM_FONT
+emacs.font: Iosevka-13.5
 emacs.cursorBlink: false
 emacs.scrollBarWidth: 20
 emacs.background: #424242
diff --git a/bspwm/.config/bspwm/commands.sh b/bspwm/.config/bspwm/commands.sh
index 7dfa787..83fb922 100644
--- a/bspwm/.config/bspwm/commands.sh
+++ b/bspwm/.config/bspwm/commands.sh
@@ -4,9 +4,9 @@ THEMES_PATH=~/.config/bspwm/themes
 CURRENT_THEME_PATH="${THEMES_PATH}/theme.sh"
 DEFAULT_THEME=lupan-dark
 
-DMENU_FONT=Iosevka:pixelsize=30
-BAR_FONT='Iosevka:size=22:antialias=true:autohint=true;5'
-BAR_HEIGHT=40
+FONT=Iosevka-13.5
+BAR_FONT="${FONT};5"
+BAR_HEIGHT=35
 
 CMD="$1"
 shift
@@ -50,7 +50,7 @@ else
     . "${THEMES_PATH}/${DEFAULT_THEME}-theme.sh"
 fi
 
-DMENU_ARGS="-nb ${BAR_BG} -nf ${BAR_FG} -sb ${BAR_ACTIVE} -sf ${BAR_FG} -fn ${DMENU_FONT}"
+DMENU_ARGS="-nb ${BAR_BG} -nf ${BAR_FG} -sb ${BAR_ACTIVE} -sf ${BAR_FG} -fn ${FONT}"
 
 set_theme() {
     echo "THEME=${THEME}" > "${CURRENT_THEME_PATH}"
diff --git a/bspwm/.config/polybar/config b/bspwm/.config/polybar/config
index d658235..b9d5ca1 100644
--- a/bspwm/.config/polybar/config
+++ b/bspwm/.config/polybar/config
@@ -7,12 +7,13 @@ empty = ${xrdb:polybar.empty:#808080}
 
 [bar/panel]
 monitor = ${env:MONITOR:}
+dpi = ${xrdb:Xft.dpi:160}
 modules-left = bspwm xwindow
 modules-right = mpd battery date
 wm-restack = bspwm
 enable-ipc = true
-font-0 = ${xrdb:polybar.font:Iosevka:pixelsize=22:antialias=true:autohint=true;5}
-height = ${xrdb:polybar.height:40}
+font-0 = ${xrdb:polybar.font:Iosevka-13.5;5}
+height = ${xrdb:polybar.height:35}
 background = ${colors.background}
 foreground = ${colors.foreground}
 padding-left = 2