diff --git a/picobot/__main__.py b/picobot/__main__.py
index 50ef0eb..7f7baa1 100755
--- a/picobot/__main__.py
+++ b/picobot/__main__.py
@@ -23,6 +23,7 @@ def main():
     dp.add_handler(CommandHandler('setdefaultpack', handlers.set_default_pack))
     dp.add_handler(CommandHandler('setpublic', handlers.handler_pack_public))
     dp.add_handler(CommandHandler('setprivate', handlers.handler_pack_private))
+    dp.add_handler(CommandHandler('change_emojis',handlers.change_emojis))
     media_filter = (Filters.photo | Filters.document) & (~Filters.reply)
     dp.add_handler(MessageHandler(filters=media_filter, callback=handlers.caption_handler))
 
diff --git a/picobot/handlers.py b/picobot/handlers.py
index cc3d177..bebf6c9 100644
--- a/picobot/handlers.py
+++ b/picobot/handlers.py
@@ -160,7 +160,7 @@ def add_text(bot: Bot, msg: Message, user_id: int, pack_name: str, emoji: str):
 
     text = msg.reply_to_message.text
     # save as png
-    img_path = sticker_from_text(user_id, username, text, avatar_path, msg_time)
+    img_path = sticker_from_text(user_id, username, text, avatar_path, msg_time, other_user_id)
     try:
         with open(img_path, 'rb') as png_sticker:
             bot.add_sticker_to_set(
@@ -311,6 +311,55 @@ def del_sticker(bot: Bot, update: Update):
         msg.reply_text(responses.REMOVE_STICKER_HELP)
 
 
+def change_emojis(bot: Bot, update: Update):
+    msg: Message = update.message
+    msg_type = get_msg_type(msg)
+    user_id = msg.from_user.id
+    response = responses.ERROR_MSG
+    splittext = shlex.split(msg.text)
+
+    # remove sticker from pack
+    try:
+        if msg_type == MsgType.REP_STICKER:
+            pack_name = msg.reply_to_message.sticker.set_name
+            sticker_id = msg.reply_to_message.sticker.file_id
+
+            if pack_name is None:
+                msg.reply_text('Não é possível remover o sticker de um pack inexistente.')
+                return
+
+        if not repository().check_permission(user_id, pack_name):
+            msg.reply_text(responses.NO_PERMISSION)
+            return
+
+        bot.delete_sticker_from_set(sticker_id)
+        # add_sticker(bot, update)
+        msg = update.message
+
+    except Exception as exc:
+        msg.reply_text("Changing Emojis: Falhou")
+        logger.error(
+            "Exception changing emojis for sticker in pack. User id %d Pack %s", user_id, pack_name,
+        )
+        logger.error(exc)
+
+    # get emojis
+    if len(splittext) > 1:
+        emoji = splittext[1]
+    else:
+        emoji = DEFAULT_EMOJI
+
+    if msg_type not in [MsgType.STICKER, MsgType.REP_STICKER]:
+        update.message.reply_text("Message is not a reply to a sticker.")
+        return
+
+    if insert_sticker_in_pack(bot, msg, user_id, pack_name, emoji):
+        return
+
+    # check for errors
+    update.message.reply_text(response)
+
+
 def set_default_pack(bot: Bot, update: Update):
     msg: Message = update.message
     user_id = msg.from_user.id
diff --git a/picobot/painter.py b/picobot/painter.py
index df65ab7..27996a6 100644
--- a/picobot/painter.py
+++ b/picobot/painter.py
@@ -152,7 +152,7 @@ def draw_time(txt_draw: ImageDraw.ImageDraw, points: Box, text="04:20"):
 
 
 def draw_avatar(
-    img: Image, draw: ImageDraw.ImageDraw, username: str, points_balloon: Box, avatar_path: str, user_id: int
+    img: Image, draw: ImageDraw.ImageDraw, username: str, points_balloon: Box, avatar_path: str, background_color: str
 ):
     y0 = points_balloon.bottom_right.y - AVATAR_SIZE
     y1 = points_balloon.bottom_right.y
@@ -160,8 +160,7 @@ def draw_avatar(
     box_position = tuple(a - 2 for a in points.top_left.to_tuple())
     size = AVATAR_SIZE + 4
     if avatar_path == '':
-        avatar_color = FOREGROUND_COLORS[user_id % len(FOREGROUND_COLORS)]
-        draw.ellipse(points.to_list(), fill=avatar_color)
+        draw.ellipse(points.to_list(), fill=background_color)
         avatar_center = points.center().to_tuple()
         draw.text(
             avatar_center, username[0], anchor='mm', font=FONTS['avatar'], fill='#FFFFFF',
@@ -184,7 +183,7 @@ def draw_avatar(
     img.paste(tmp, mask=avatar_mask)
 
 
-def sticker_from_text(user_id: int, username: str, text: str, avatar_path: str, msg_time: str):
+def sticker_from_text(user_id: int, username: str, text: str, avatar_path: str, msg_time: str, other_user_id: int):
     '''
     Creates an image from a text message, emulating Telegram's message layout/design.
     '''
@@ -227,12 +226,12 @@ def sticker_from_text(user_id: int, username: str, text: str, avatar_path: str,
 
     img = Image.new("RGBA", size, transparent)
     dr = ImageDraw.Draw(img)
-    draw_avatar(img, dr, username, points_balloon=points_balloon, avatar_path=avatar_path, user_id=user_id)
+    user_color = get_user_color(other_user_id)
+    draw_avatar(img, dr, username, points_balloon=points_balloon, avatar_path=avatar_path, background_color=user_color)
 
     draw_balloon(dr, points=points_balloon, fill=BOX_COLOR)
 
-    username_color = FOREGROUND_COLORS[user_id % len(FOREGROUND_COLORS)]
-    draw_username(dr, position=points_balloon.top_left, username=username, fill=username_color)
+    draw_username(dr, position=points_balloon.top_left, username=username, fill=user_color)
     draw_message(dr, points=points_balloon, text=final_text, user_size=title_size)
     draw_time(dr, text=msg_time, points=points_balloon)
 
@@ -297,3 +296,7 @@ def generate_avatar_mask(img_size: tuple, points: Box):
     maskdraw.ellipse(points.to_list(), fill='#FFFFFF')
     del maskdraw
     return img
+
+
+def get_user_color(user_id: int) -> str:
+    return FOREGROUND_COLORS[user_id % len(FOREGROUND_COLORS)]