diff --git a/data/applications/pamac-install.desktop b/data/applications/pamac-install.desktop
index eeef2c6..75bea8f 100644
--- a/data/applications/pamac-install.desktop
+++ b/data/applications/pamac-install.desktop
@@ -125,7 +125,7 @@ Categories=System;
 Exec=pamac-install %F
 Terminal=false
 Type=Application
-Icon=system-software-install
+Icon=/usr/share/pamac/icons/32x32/apps/pamac.png
 StartupNotify=true
 NoDisplay=true
 MimeType=application/x-xz-compressed-tar;
diff --git a/data/applications/pamac-manager.desktop b/data/applications/pamac-manager.desktop
index b510029..dd5c231 100644
--- a/data/applications/pamac-manager.desktop
+++ b/data/applications/pamac-manager.desktop
@@ -130,7 +130,7 @@ Comment[vi]=Thêm hoặc gỡ phần mềm cài đặt trên hệ thống
 Comment[zh_CN]=添加或删除系统中安装的软件
 Comment[zh_HK]=加入或移除系統上安裝的軟件
 Comment[zh_TW]=加入或移除系統上安裝的軟體
-Icon=system-software-install
+Icon=/usr/share/pamac/icons/32x32/apps/pamac.png
 Exec=pamac-manager
 Terminal=false
 Type=Application
diff --git a/data/applications/pamac-updater.desktop b/data/applications/pamac-updater.desktop
index a24cb54..b8de826 100644
--- a/data/applications/pamac-updater.desktop
+++ b/data/applications/pamac-updater.desktop
@@ -126,7 +126,7 @@ Comment[vi]=Cập nhật phần mềm đã cài đặt trên hệ thống
 Comment[zh_CN]=更新本系统中安装的软件
 Comment[zh_HK]=更新系統中已安裝的軟件
 Comment[zh_TW]=更新系統中已安裝的軟體
-Icon=system-software-update
+Icon=/usr/share/pamac/icons/32x32/apps/pamac-updater.png
 Exec=pamac-updater
 Terminal=false
 Type=Application
diff --git a/data/icons/16x16/apps/exit.png b/data/icons/16x16/apps/exit.png
new file mode 100644
index 0000000..c2c9727
Binary files /dev/null and b/data/icons/16x16/apps/exit.png differ
diff --git a/data/icons/16x16/apps/pamac-updater.png b/data/icons/16x16/apps/pamac-updater.png
new file mode 100644
index 0000000..2f07dba
Binary files /dev/null and b/data/icons/16x16/apps/pamac-updater.png differ
diff --git a/data/icons/16x16/apps/pamac.png b/data/icons/16x16/apps/pamac.png
new file mode 100644
index 0000000..f88f63d
Binary files /dev/null and b/data/icons/16x16/apps/pamac.png differ
diff --git a/data/icons/32x32/apps/pamac-updater.png b/data/icons/32x32/apps/pamac-updater.png
new file mode 100644
index 0000000..ab481ab
Binary files /dev/null and b/data/icons/32x32/apps/pamac-updater.png differ
diff --git a/data/icons/32x32/apps/pamac.png b/data/icons/32x32/apps/pamac.png
new file mode 100644
index 0000000..b69e13c
Binary files /dev/null and b/data/icons/32x32/apps/pamac.png differ
diff --git a/pamac-tray.py b/pamac-tray.py
index bbaa3d5..75ad248 100755
--- a/pamac-tray.py
+++ b/pamac-tray.py
@@ -30,15 +30,15 @@ class Tray:
 
 		self.menu = Gtk.Menu()
 		self.menuItem = Gtk.ImageMenuItem(_('Update Manager'))
-		self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-update', 16, 0)))
+		self.menuItem.set_from_file('/usr/share/pamac/icons/16x16/apps/pamac-updater.png')
 		self.menuItem.connect('activate', self.execute_update, self.statusIcon)
 		self.menu.append(self.menuItem)
 		self.menuItem = Gtk.ImageMenuItem(_('Package Manager'))
-		self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-install', 16, 0)))
+		self.menuItem.set_from_file('/usr/share/pamac/icons/16x16/apps/pamac.png')
 		self.menuItem.connect('activate', self.execute_manager, self.statusIcon)
 		self.menu.append(self.menuItem)
 		self.menuItem = Gtk.ImageMenuItem(_('Quit'))
-		self.menuItem.set_image(Gtk.Image.new_from_stock('gtk-quit', Gtk.IconSize.MENU))
+		self.menuItem.set_from_file('/usr/share/pamac/icons/16x16/apps/exit.png')
 		self.menuItem.connect('activate', self.quit_tray, self.statusIcon)
 		self.menu.append(self.menuItem)
 
@@ -110,7 +110,7 @@ def set_icon(updates):
 		tray.set_visible(True)
 		sleep(2)
 		if not common.pid_file_exists():
-			Popen(['notify-send', '-i', 'system-software-update', '-u', 'normal', _('Update Manager'), info])
+			Popen(['notify-send', '-i', '/usr/share/pamac/icons/32x32/apps/pamac-updater.png', '-u', 'normal', _('Update Manager'), info])
 	else:
 		icon = noupdate_icon
 		info = noupdate_info