diff --git a/config/desktop/common/appgroups/chat/packages b/config/desktop/common/appgroups/chat/packages
index 197c98ab0..750362098 100644
--- a/config/desktop/common/appgroups/chat/packages
+++ b/config/desktop/common/appgroups/chat/packages
@@ -1,4 +1 @@
 hexchat
-#pidgin
-#purple-discord
-#purple-rocketchat
diff --git a/config/desktop/common/appgroups/desktop_tools/packages b/config/desktop/common/appgroups/desktop_tools/packages
index 9accdd497..8f7985c31 100644
--- a/config/desktop/common/appgroups/desktop_tools/packages
+++ b/config/desktop/common/appgroups/desktop_tools/packages
@@ -1,2 +1,3 @@
 bleachbit
+baobab
 gparted
diff --git a/config/desktop/common/appgroups/multimedia/packages b/config/desktop/common/appgroups/multimedia/packages
index b7d6f3555..5c359ce3f 100644
--- a/config/desktop/common/appgroups/multimedia/packages
+++ b/config/desktop/common/appgroups/multimedia/packages
@@ -2,4 +2,8 @@ celluloid
 eog
 gimp
 pithos
+shotwell
+rhythmbox
+rhythmbox-data
 mpv
+totem
diff --git a/config/desktop/common/appgroups/office/packages b/config/desktop/common/appgroups/office/packages
index bb3cf6350..bfba716c9 100644
--- a/config/desktop/common/appgroups/office/packages
+++ b/config/desktop/common/appgroups/office/packages
@@ -1,4 +1,7 @@
+evince
+evince-common
 libreoffice
 libreoffice-gtk3
 libreoffice-style-elementary
 simple-scan
+sane-utils
diff --git a/config/desktop/common/environments/gnome/config_base/packages b/config/desktop/common/environments/gnome/config_base/packages
index 346a7495d..3ba8aac51 100644
--- a/config/desktop/common/environments/gnome/config_base/packages
+++ b/config/desktop/common/environments/gnome/config_base/packages
@@ -2,18 +2,32 @@ anacron
 at-spi2-core
 colord
 cups
+cups-browsed
+cups-bsd
+cups-pk-helper
+bolt
+bluez-cups
+cifs-utils
+fprintd
 dbus-x11
 dmz-cursor-theme
 dconf-cli
 eject
 foomatic-db-compressed-ppds
 fonts-noto-cjk
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-droid-fallback
+fonts-liberation-sans-narrow
+fonts-noto-core
+fonts-noto-mono
 fonts-ubuntu
 fonts-ubuntu-console
 gdebi
 gnome-control-center
 gnome-disk-utility
 gnome-desktop3-data
+gnome-online-accounts
 gnome-keyring
 gnome-menus
 gnome-screenshot
diff --git a/config/optional/architectures/amd64/_config/desktop/common/appgroups/chat/packages b/config/optional/architectures/amd64/_config/desktop/common/appgroups/chat/packages
new file mode 100644
index 000000000..e46fba20a
--- /dev/null
+++ b/config/optional/architectures/amd64/_config/desktop/common/appgroups/chat/packages
@@ -0,0 +1 @@
+discord
diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index 1613cc462..6f520334b 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -552,6 +552,9 @@ add_user() {
 		if ! id "$RealUserName" > /dev/null 2>&1; then break; else echo -e "Username \e[0;31m$RealUserName\x1B[0m already exists on the system."; fi
 	done
 
+	# Set default user login icon
+	set_user_icon "$RealUserName"
+
 	while [ -f "/root/.not_logged_in_yet" ]; do
 		if [ -z "$PRESET_USER_PASSWORD" ];then
 			read_password "Create user ($username)"
@@ -605,7 +608,7 @@ add_user() {
 			# (docker-ce package creates this group automatically during postinst, but we create it early
 			# to guarantee group membership is ready immediately after user creation.)
 			if ! getent group docker >/dev/null; then
-				if ! addgroup --system docker 2>/dev/null; then
+				if ! addgroup --system --quiet docker 2>/dev/null; then
 					echo "Warning: Failed to create docker group" >&2
 				fi
 			fi
@@ -637,6 +640,31 @@ add_user() {
 
 }
 
+set_user_icon() {
+    local U="$1"
+    local ICON_SRC="/usr/share/armbian/armbian-user-icon.png"
+    local ICON_DST="/var/lib/AccountsService/icons/$U"
+    local META="/var/lib/AccountsService/users/$U"
+
+    # If the icon doesn't exist, do nothing.
+    [ -f "$ICON_SRC" ] || return 0
+
+    mkdir -p /var/lib/AccountsService/icons /var/lib/AccountsService/users
+
+    # Copy icon
+    install -m 0644 "$ICON_SRC" "$ICON_DST"
+
+    # Write AccountsService metadata
+	cat <<- EOF > "$META"
+	[User]
+	Icon=$ICON_DST
+	SystemAccount=false
+	EOF
+    chown root:root "$ICON_DST" "$META"
+    chmod 0644 "$ICON_DST" "$META"
+}
+
+
 if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
 
 	. /root/.not_logged_in_yet
diff --git a/packages/bsp/common/usr/share/armbian/armbian-user-icon.png b/packages/bsp/common/usr/share/armbian/armbian-user-icon.png
new file mode 100644
index 000000000..9935af299
Binary files /dev/null and b/packages/bsp/common/usr/share/armbian/armbian-user-icon.png differ