diff --git a/core/main/client/os.js b/core/main/client/os.js
index 2a6e865b2..b12024860 100644
--- a/core/main/client/os.js
+++ b/core/main/client/os.js
@@ -81,6 +81,10 @@ beef.os = {
 		return (this.ua.indexOf('iPad') != -1) ? true : false;
 	},
 
+	isIpod: function() {
+		return (this.ua.indexOf('iPod') != -1) ? true : false;
+	},
+
 	isNokia: function() {
 		return (this.ua.match('(Maemo Browser)|(Symbian)|(Nokia)')) ? true : false;
 	},
@@ -106,7 +110,6 @@ beef.os = {
 		if(this.isWin311()) return 'Windows 3.11';
 		if(this.isWinNT4()) return 'Windows NT 4';
 		if(this.isWin95()) return 'Windows 95';
-		if(this.isWin95()) return 'Windows 98';
 		if(this.isWin98()) return 'Windows 98';
 		if(this.isWinME()) return 'Windows Millenium';
 		if(this.isWin2000()) return 'Windows 2000';
@@ -139,6 +142,8 @@ beef.os = {
 		if (this.isIphone()) return 'iPhone';
 		//iPad
 		if (this.isIpad()) return 'iPad';
+		//iPod
+		if (this.isIpod()) return 'iPod';
 		
 		//macintosh
 		if(this.isMacintosh()) {
diff --git a/core/main/constants/os.rb b/core/main/constants/os.rb
index 2014de11d..367f10d61 100644
--- a/core/main/constants/os.rb
+++ b/core/main/constants/os.rb
@@ -27,8 +27,20 @@ module Constants
   	OS_LINUX_IMG          = 'linux.png'
   	OS_MAC_UA_STR         = 'Mac'
   	OS_MAC_IMG            = 'mac.png'
+	OS_QNX_UA_STR	      = 'QNX'
+	OS_QNX_IMG	      = 'qnx.ico'
+	OS_BEOS_UA_STR	      = 'BeOS'
+	OS_BEOS_IMG	      = 'beos.png'
+	OS_OPENBSD_UA_STR     = 'OpenBSD'
+	OS_OPENBSD_IMG	      = 'openbsd.ico'
 	OS_IPHONE_UA_STR      = 'iPhone'
  	OS_IPHONE_IMG         = 'iphone.png'
+	OS_IPAD_UA_STR	      = 'iPad'
+	OS_IPAD_IMG	      = 'ipad.png'
+	OS_IPOD_UA_STR	      = 'iPod'
+	OS_IPOD_IMG	      = 'ipod.jpg'
+	OS_MAEMO_UA_STR	      = 'Maemo'
+	OS_MAEMO_IMG	      = 'maemo.ico'
 	OS_BLACKBERRY_UA_STR  = 'BlackBerry'
 	OS_BLACKBERRY_IMG     = 'blackberry.png'
 	OS_ANDROID_UA_STR     = 'Android'
@@ -43,8 +55,20 @@ module Constants
 					OS_LINUX_UA_STR
 				when /os x/, /osx/, /mac/
 					OS_MAC_UA_STR
+				when /qnx/
+					OS_QNX_UA_STR
+				when /beos/
+					OS_BEOS_UA_STR
+				when /openbsd/
+					OS_OPENBSD_UA_STR
 				when /iphone/
 					OS_IPHONE_UA_STR
+				when /ipad/
+					OS_IPAD_UA_STR
+				when /ipod/
+					OS_IPOD_UA_STR
+				when /maemo/
+					OS_MAEMO_UA_STR
 				when /blackberry/
 					OS_BLACKBERRY_UA_STR
 				when /android/
diff --git a/extensions/admin_ui/media/images/icons/beos.png b/extensions/admin_ui/media/images/icons/beos.png
new file mode 100644
index 000000000..93625723c
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/beos.png differ
diff --git a/extensions/admin_ui/media/images/icons/ipad.png b/extensions/admin_ui/media/images/icons/ipad.png
new file mode 100644
index 000000000..3596dc702
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/ipad.png differ
diff --git a/extensions/admin_ui/media/images/icons/ipod.jpg b/extensions/admin_ui/media/images/icons/ipod.jpg
new file mode 100644
index 000000000..b24e96785
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/ipod.jpg differ
diff --git a/extensions/admin_ui/media/images/icons/maemo.ico b/extensions/admin_ui/media/images/icons/maemo.ico
new file mode 100644
index 000000000..a25fbbff6
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/maemo.ico differ
diff --git a/extensions/admin_ui/media/images/icons/openbsd.ico b/extensions/admin_ui/media/images/icons/openbsd.ico
new file mode 100644
index 000000000..3334a3d1e
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/openbsd.ico differ
diff --git a/extensions/admin_ui/media/images/icons/qnx.ico b/extensions/admin_ui/media/images/icons/qnx.ico
new file mode 100644
index 000000000..9001bd47d
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/qnx.ico differ
diff --git a/extensions/initialization/models/browserdetails.rb b/extensions/initialization/models/browserdetails.rb
index 88a91cbbd..fc82acef3 100644
--- a/extensions/initialization/models/browserdetails.rb
+++ b/extensions/initialization/models/browserdetails.rb
@@ -102,7 +102,13 @@ module Models
       return BeEF::Core::Constants::Os::OS_UNKNOWN_IMG if ua_string.nil?
       return BeEF::Core::Constants::Os::OS_WINDOWS_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_WINDOWS_UA_STR
       return BeEF::Core::Constants::Os::OS_LINUX_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_LINUX_UA_STR
+      return BeEF::Core::Constants::Os::OS_QNX_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_QNX_UA_STR
+      return BeEF::Core::Constants::Os::OS_BEOS_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_BEOS_UA_STR
+      return BeEF::Core::Constants::Os::OS_OPENBSD_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_OPENBSD_UA_STR
       return BeEF::Core::Constants::Os::OS_IPHONE_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_IPHONE_UA_STR
+      return BeEF::Core::Constants::Os::OS_IPAD_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_IPAD_UA_STR
+      return BeEF::Core::Constants::Os::OS_IPOD_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_IPOD_UA_STR
+      return BeEF::Core::Constants::Os::OS_MAEMO_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_MAEMO_UA_STR
       return BeEF::Core::Constants::Os::OS_MAC_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_MAC_UA_STR
       return BeEF::Core::Constants::Os::OS_BLACKBERRY_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_BLACKBERRY_UA_STR
       return BeEF::Core::Constants::Os::OS_ANDROID_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_ANDROID_UA_STR