3 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 5d0fbce..0497d99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
+16
+
+<<<<<<< HEAD/NEWS
+* Fix icon and roundbox changes in sugar (morgs)
+
+=======
 * Add greek translation (simosx)
 * Add arabic translation (khaled)
 
+>>>>>>> 2595c9996dfb42180c68bd75a27118f1693e561c/NEWS
 15
 
 * Rename buddy icon (morgs)
diff --git a/activity/activity.info b/activity/activity.info
index f516d63..caff0b7 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Chat
-activity_version = 15
+activity_version = 16
 host_version = 1
 icon = activity-chat
 service_name = org.laptop.Chat
diff --git a/chat.py b/chat.py
index 4bcd9f6..64b36e2 100644
--- a/chat.py
+++ b/chat.py
@@ -164,7 +164,7 @@ class Chat(Activity):
         if not buddy_color:
             buddy_color = "#000000,#ffffff"
         icon = CanvasIcon(
-            icon_name='theme:computer-xo',
+            icon_name='computer-xo',
             xo_color=XoColor(buddy_color))
         return icon