diff --git a/Makefile b/Makefile
index d0405a8..970147d 100644
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,8 @@ uninstall:
 	    $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
 	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${pkgname}.svg"; \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${pkgname}.png"; \
+	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${pkgname}.svg"; \
+	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${pkgname}.png"; \
 	done	
 	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
@@ -103,18 +103,18 @@ install: check uninstall
 	done
 	@for SIZE in 16 32 48; do \
 		install -dm755 "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data ${pkgname}.svg -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${pkgname}.png"; \
+		rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "ru.ublinux.${pkgname}.svg" -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${pkgname}.png"; \
 	done
 	@install -dm755 "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "${pkgname}.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "ru.ublinux.${pkgname}.svg"
 	@install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${pkgname}"
 	@install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop"
 	@install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${pkgname}.exec.policy"
 	@install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,images,css}
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/ui/" "${pkgname}.glade"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css 
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
+	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-checked.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-warning.svg"
diff --git a/ubl-settings-datetime.png b/ru.ublinux.ubl-settings-datetime.png
similarity index 100%
rename from ubl-settings-datetime.png
rename to ru.ublinux.ubl-settings-datetime.png
diff --git a/ubl-settings-datetime.svg b/ru.ublinux.ubl-settings-datetime.svg
similarity index 100%
rename from ubl-settings-datetime.svg
rename to ru.ublinux.ubl-settings-datetime.svg
diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop
index 6ed43e7..edc26a9 100644
--- a/ubl-settings-datetime.desktop
+++ b/ubl-settings-datetime.desktop
@@ -8,7 +8,7 @@ Comment=Date time settings
 Comment[ru]=Приложение для настройки даты и времени
 Type=Application
 Exec=pkexec ubl-settings-datetime
-Icon=ubl-settings-datetime
+Icon=ru.ublinux.ubl-settings-datetime
 Terminal=false
 X-XfcePluggable=true
 X-UBLPluggable=true
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 459f6fa..d179374 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -23,7 +23,7 @@
 Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
     <property name="authors">UBGroup</property>
     <property name="artists">UBGroup</property>
-    <property name="logo-icon-name">ubl-settings-datetime</property>
+    <property name="logo-icon-name">ru.ublinux.ubl-settings-datetime</property>
     <property name="wrap-license">True</property>
     <property name="license-type">gpl-2-0</property>
     <child internal-child="vbox">
@@ -227,7 +227,7 @@
                         <property name="margin-top">6</property>
                         <property name="margin-bottom">6</property>
                         <property name="pixel-size">69</property>
-                        <property name="icon-name">ubl-settings-datetime</property>
+                        <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -984,7 +984,7 @@ Format: DD.MM.YYYY</property>
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">ubl-settings-datetime</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
           </object>
         </child>
         <child>
@@ -1185,6 +1185,7 @@ Format: DD.MM.YYYY</property>
   <object class="GtkWindow" id="windowMessDchp">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Внимание!</property>
+    <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
     <child>
       <object class="GtkBox">
@@ -1268,6 +1269,7 @@ Format: DD.MM.YYYY</property>
     <property name="type">popup</property>
     <property name="title" translatable="yes">Внимание!</property>
     <property name="window-position">center</property>
+    <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
     <child>
       <object class="GtkBox">