diff --git a/bin/mb-jgtools b/bin/mb-jgtools
index f365ca2..8e90817 100755
--- a/bin/mb-jgtools
+++ b/bin/mb-jgtools
@@ -145,7 +145,7 @@ trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT
 MENU_HALIGN="right"
 ITEM_HALIGN="left"
 ARROW_STRING=" ⮜ "
-ICON_SIZE="18"
+[ $jgmenu_use_icons == true ] && ICON_SIZE=18
 TABS="100"
 MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2)
 
@@ -272,8 +272,8 @@ $SCREENSHOT,mb-jgtools screenshot,emblem-photos
 
 ^tag(system)
 ^sep($SYS_AND_HARDWARE)
-$LOCALE_SETTINGS,manjaro-settings-manager -m msm_locale,
-$LANGUAGE_PACKAGES,manjaro-settings-manager -m msm_language_packages,
+$LOCALE_SETTINGS,manjaro-settings-manager -m msm_locale,chronometer
+$LANGUAGE_PACKAGES,manjaro-settings-manager -m msm_language_packages,globe
 $KERNEL,manjaro-settings-manager -m msm_kernel,distributor-logo-linux
 $USER_ACCOUNTS,manjaro-settings-manager -m msm_users,system-config-users
 $TIME_DATE,manjaro-settings-manager -m msm_timedate,system-config-date
@@ -406,10 +406,10 @@ case $LANG in
     ;;
 esac
 
-JGWIDTH="340"
+JGWIDTH="348"
 MENU_HALIGN="center"
 MENU_VALIGN="center"
-MENU_PADDING_TOP=213
+MENU_PADDING_TOP=221
 TABS="250"
 ITEM_HEIGHT="30"
 ICON_SIZE="24"
@@ -421,7 +421,7 @@ mkconfigfile
 wmctrl -k on
 THUMB="$(DISPLAY=:0 scrot -t 340x213 -o /tmp/mblogout.png -e 'echo $m')"
 cat <<EOF > ${MENU_ITEMS}
-@icon,,0,0,340,100,4,left,top,,,$THUMB
+@icon,,4,4,340,100,4,left,top,,,$THUMB
 @icon,,10,20,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png
 @text,,180,170,220,20,4,left,top,#EEEEEE,#111111,$OSNAME $OSVERSION <sup> $OSCODE</sup>
 @text,,180,190,200,20,4,left,top,#DDDDDD,#DDDDDD,<small>$USER@$HOSTNAME</small>
@@ -467,8 +467,8 @@ case $LANG in
     CANCEL="Cancel"
      ;;
 esac
-JGWIDTH="340"
-MENU_PADDING_TOP=213
+JGWIDTH="348"
+MENU_PADDING_TOP=221
 MENU_HALIGN="center"
 MENU_VALIGN="center"
 TABS="280"
@@ -486,7 +486,7 @@ THUMB="$(DISPLAY=:0 scrot -t 340x213 -o /tmp/jgscrot.png -e 'echo $m')"
 mkconfigfile
 
 cat <<EOF > ${MENU_ITEMS}
-@icon,,0,0,340,100,4,left,top,,,$THUMB
+@icon,,4,4,340,100,4,left,top,,,$THUMB
 ^sep($SCRNSHOTS)
       $FULLSCR,^root(full)
       $ACTIVE_WIN,^root(window)