diff --git a/src/Nazara/Graphics/Tilemap.cpp b/src/Nazara/Graphics/Tilemap.cpp
index 1f4ff8f6b..563a17bfc 100644
--- a/src/Nazara/Graphics/Tilemap.cpp
+++ b/src/Nazara/Graphics/Tilemap.cpp
@@ -4,6 +4,8 @@
 
 #include <Nazara/Graphics/Tilemap.hpp>
 #include <Nazara/Graphics/ElementRendererRegistry.hpp>
+#include <Nazara/Graphics/Graphics.hpp>
+#include <Nazara/Graphics/MaterialInstance.hpp>
 #include <Nazara/Graphics/RenderSpriteChain.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
diff --git a/src/Nazara/Widgets/DefaultWidgetTheme.cpp b/src/Nazara/Widgets/DefaultWidgetTheme.cpp
index 14e4a4a73..59b09c627 100644
--- a/src/Nazara/Widgets/DefaultWidgetTheme.cpp
+++ b/src/Nazara/Widgets/DefaultWidgetTheme.cpp
@@ -124,29 +124,9 @@ namespace Nz
 		texParams.renderDevice = Graphics::Instance()->GetRenderDevice();
 		texParams.loadFormat = PixelFormat::RGBA8; //< TODO: Re-enable gamma correction
 
-		const auto& defaultBasicMaterial = Graphics::Instance()->GetDefaultMaterials();
-		const MaterialPassRegistry& materialPassRegistry = Graphics::Instance()->GetMaterialPassRegistry();
-
-		std::size_t depthPassIndex = materialPassRegistry.GetPassIndex("DepthPass");
-		std::size_t forwardPassIndex = materialPassRegistry.GetPassIndex("ForwardPass");
-
 		auto CreateMaterialFromTexture = [&](std::shared_ptr<Texture> texture)
 		{
-			std::shared_ptr<MaterialInstance> material = MaterialInstance::Instantiate(MaterialType::Basic);
-			material->DisablePass(depthPassIndex);
-			material->UpdatePassStates(forwardPassIndex, [](RenderStates& renderStates)
-			{
-				renderStates.depthWrite = false;
-				renderStates.scissorTest = true;
-				renderStates.blending = true;
-				renderStates.blend.modeColor = BlendEquation::Add;
-				renderStates.blend.modeAlpha = BlendEquation::Add;
-				renderStates.blend.srcColor = BlendFunc::SrcAlpha;
-				renderStates.blend.dstColor = BlendFunc::InvSrcAlpha;
-				renderStates.blend.srcAlpha = BlendFunc::One;
-				renderStates.blend.dstAlpha = BlendFunc::One;
-			});
-
+			std::shared_ptr<MaterialInstance> material = Widgets::Instance()->GetTransparentMaterial()->Clone();
 			material->SetTextureProperty("BaseColorMap", std::move(texture));
 
 			return material;