diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/sddm/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/sddm/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/sddm/faces/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/sddm/faces/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/sddm/faces/usericon b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-system/x11-misc/sddm/faces/usericon
rename to profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
new file mode 100644
index 000000000..e842777c5
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip exists(#-ur_home_path-#/.face,root)!= chmod=0755 chown=root:root
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
new file mode 100644
index 000000000..579cffac5
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
@@ -0,0 +1 @@
+# Calculate name=#-ur_login-# path=/var/lib/AccountsService/icons link=#-ur_home_path-#/.face mirror