diff --git a/src/aomovie.cpp b/src/aomovie.cpp
index fff8014..561f5ef 100644
--- a/src/aomovie.cpp
+++ b/src/aomovie.cpp
@@ -35,20 +35,15 @@ void AOMovie::play(QString p_image, QString p_char, QString p_custom_theme, int
     QList<QString> pathlist;
 
     pathlist = {
-      ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_image + "_bubble"),   //Misc path
-      ao_app->get_image_suffix(ao_app->get_custom_theme_path(p_custom_theme, p_image)),                           //Custom theme path
-      ao_app->get_image_suffix(ao_app->get_theme_path(p_image)),                                                  //Theme path
-      ao_app->get_image_suffix(ao_app->get_default_theme_path(p_image)),                                          //Default theme path
-      ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")),                                          //Placeholder path
-      ao_app->get_image_suffix( ao_app->get_default_theme_path("placeholder")),                                 //Default placeholder path
+      ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_image)),                        //Character folder
+      ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_image), //Misc path
+      ao_app->get_image_suffix(ao_app->get_custom_theme_path(p_custom_theme, p_image)),             //Custom theme path
+      ao_app->get_image_suffix(ao_app->get_theme_path(p_image)),                                    //Theme path
+      ao_app->get_image_suffix(ao_app->get_default_theme_path(p_image)),                            //Default theme path
+      ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")),                              //Placeholder path
+      ao_app->get_image_suffix( ao_app->get_default_theme_path("placeholder")),                     //Default placeholder path
     };
 
-    //Add this at the beginning of the list - order matters.
-    if (p_image == "custom")
-      pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_image)));
-    else
-      pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_image + "_bubble")));
-
     for (QString path : pathlist)
     {
       if (file_exists(path))
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 4291468..1797706 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1508,6 +1508,8 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
   if (m_chatmessage[MESSAGE] == ui_ic_chat_message->text() && m_chatmessage[CHAR_ID].toInt() == m_cid)
   {
     ui_ic_chat_message->clear();
+    if (ui_additive->isChecked())
+      ui_ic_chat_message->insert(" ");
     objection_state = 0;
     realization_state = 0;
     screenshake_state = 0;