diff --git a/lib/constants.rb b/lib/constants.rb
index 46936abe6..575541e7b 100644
--- a/lib/constants.rb
+++ b/lib/constants.rb
@@ -29,6 +29,7 @@ module Constants
   	S       = 'S'        # Safari
   	K       = 'K'        # Konqueror
   	C       = 'C'        # Chrome
+    O       = 'O'        # Opera
   	ALL     = 'ALL'      # ALL
   	UNKNOWN = 'UN'       # Unknown
   	
@@ -37,7 +38,8 @@ module Constants
   	FRIENDLY_IE_NAME  = 'Internet Explorer'
   	FRIENDLY_S_NAME   = 'Safari'
   	FRIENDLY_K_NAME   = 'Konqueror'
-  	FRIENDLY_C_NAME   = 'Chrome'  	
+  	FRIENDLY_C_NAME   = 'Chrome'
+    FRIENDLY_O_NAME   = 'Opera'
   	FRIENDLY_UN_NAME  = "UNKNOWN"
     
   	def self.friendly_name(browser_name)
@@ -48,7 +50,8 @@ module Constants
   	  when IE;       return FRIENDLY_IE_NAME   	   
   	  when S;        return FRIENDLY_S_NAME  	   
   	  when K;        return FRIENDLY_K_NAME  	   
-  	  when C;        return FRIENDLY_C_NAME
+      when C;        return FRIENDLY_C_NAME
+      when O;        return FRIENDLY_O_NAME
       when UNKNOWN;  return FRIENDLY_UN_NAME
   	  end
   	  
@@ -70,6 +73,8 @@ module Constants
 					    matches << K
 					  when /Chrome/
 					    matches << C
+            when /Opera/
+					    matches << O
 					end
 				end
 				matches.uniq
@@ -93,6 +98,8 @@ module Constants
   	AGENT_KONQ_IMG        = 'konqueror.png'
   	AGENT_CHROME_UA_STR   = 'Chrome'
   	AGENT_CHROME_IMG      = 'chrome.png'
+    AGENT_OPERA_UA_STR    = 'Opera'
+  	AGENT_OPERA_IMG       = 'opera.ico'
     
   end
   
diff --git a/lib/model/browserdetails.rb b/lib/model/browserdetails.rb
index 6a62ad6bd..8ee8b00eb 100644
--- a/lib/model/browserdetails.rb
+++ b/lib/model/browserdetails.rb
@@ -67,6 +67,7 @@ class BrowserDetails
     return BeEF::Constants::Agents::AGENT_FIREFOX_IMG if browser.eql? "FF" # Firefox
     return BeEF::Constants::Agents::AGENT_SAFARI_IMG  if browser.eql? "S"  # Safari
     return BeEF::Constants::Agents::AGENT_CHROME_IMG  if browser.eql? "C"  # Chrome
+    return BeEF::Constants::Agents::AGENT_OPERA_IMG   if browser.eql? "O"  # Opera
     
     BeEF::Constants::Agents::AGENT_UNKNOWN_IMG
   end
diff --git a/lib/model/zombie.rb b/lib/model/zombie.rb
index 86ab0303d..2c068280a 100644
--- a/lib/model/zombie.rb
+++ b/lib/model/zombie.rb
@@ -43,6 +43,7 @@ class Zombie
     return BeEF::Constants::Agents::AGENT_SAFARI_IMG  if agent.include? BeEF::Constants::Agents::AGENT_SAFARI_UA_STR
     return BeEF::Constants::Agents::AGENT_KONQ_IMG    if agent.include? BeEF::Constants::Agents::AGENT_KONQ_UA_STR
     return BeEF::Constants::Agents::AGENT_CHROME_IMG  if agent.include? BeEF::Constants::Agents::AGENT_CHROME_UA_STR
+    return BeEF::Constants::Agents::AGENT_OPERA_IMG   if agent.include? BeEF::Constants::Agents::AGENT_OPERA_UA_STR
     
     BeEF::Constants::Agents::AGENT_UNKNOWN_IMG
   end
diff --git a/public/images/icons/opera.ico b/public/images/icons/opera.ico
new file mode 100644
index 000000000..036dc5785
Binary files /dev/null and b/public/images/icons/opera.ico differ
diff --git a/public/images/icons/opera.png b/public/images/icons/opera.png
deleted file mode 100644
index 9b709885e..000000000
Binary files a/public/images/icons/opera.png and /dev/null differ