diff --git a/griffin/griffin.c b/griffin/griffin.c
index 38ab18dcc3..7d54aead27 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1196,7 +1196,9 @@ MENU
 #include "../menu/widgets/menu_dialog.c"
 #include "../menu/widgets/menu_input_dialog.c"
 #include "../menu/widgets/menu_input_bind_dialog.c"
+#ifdef HAVE_MENU_WIDGETS
 #include "../menu/widgets/menu_widgets.c"
+#endif
 #include "../menu/widgets/menu_osk.c"
 #include "../menu/cbs/menu_cbs_ok.c"
 #include "../menu/cbs/menu_cbs_cancel.c"
diff --git a/ui/drivers/qt/coreoptionsdialog.cpp b/ui/drivers/qt/coreoptionsdialog.cpp
index 83900267c5..1c874debfa 100644
--- a/ui/drivers/qt/coreoptionsdialog.cpp
+++ b/ui/drivers/qt/coreoptionsdialog.cpp
@@ -149,7 +149,10 @@ void CoreOptionsDialog::onSaveGameSpecificOptions()
    {
       runloop_msg_queue_push(
             msg_hash_to_str(MSG_CORE_OPTIONS_FILE_CREATED_SUCCESSFULLY),
-            1, 100, true);
+            1, 100, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT,
+            MESSAGE_QUEUE_CATEGORY_INFO
+            );
       path_set(RARCH_PATH_CORE_OPTIONS, game_path);
    }
 
diff --git a/ui/drivers/qt/shaderparamsdialog.cpp b/ui/drivers/qt/shaderparamsdialog.cpp
index 3935fa8521..44885ed947 100644
--- a/ui/drivers/qt/shaderparamsdialog.cpp
+++ b/ui/drivers/qt/shaderparamsdialog.cpp
@@ -770,11 +770,17 @@ void ShaderParamsDialog::saveShaderPreset(const char *path, unsigned action_type
    if (menu_shader_manager_save_preset(file, false, true))
       runloop_msg_queue_push(
             msg_hash_to_str(MSG_SHADER_PRESET_SAVED_SUCCESSFULLY),
-            1, 100, true);
+            1, 100, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT,
+            MESSAGE_QUEUE_CATEGORY_INFO
+            );
    else
       runloop_msg_queue_push(
             msg_hash_to_str(MSG_ERROR_SAVING_SHADER_PRESET),
-            1, 100, true);
+            1, 100, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT,
+            MESSAGE_QUEUE_CATEGORY_ERROR
+            );
 }
 
 void ShaderParamsDialog::onShaderSaveCorePresetClicked()