diff --git a/src/d3d11/d3d11_shader.cpp b/src/d3d11/d3d11_shader.cpp
index 332d9cffd..e83f0dee5 100644
--- a/src/d3d11/d3d11_shader.cpp
+++ b/src/d3d11/d3d11_shader.cpp
@@ -59,13 +59,13 @@ namespace dxvk {
     }
     
     // Create shader constant buffer if necessary
-    const DxvkShaderCreateInfo& shaderInfo = m_shader->info();
+    auto icb = module.icbInfo();
 
-    if (shaderInfo.uniformSize) {
-      DxvkBufferCreateInfo info;
-      info.size   = shaderInfo.uniformSize;
+    if (icb.size) {
+      DxvkBufferCreateInfo info = { };
+      info.size   = align(icb.size, 256u);
       info.usage  = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
-      info.stages = util::pipelineStages(shaderInfo.stage);
+      info.stages = util::pipelineStages(m_shader->info().stage);
       info.access = VK_ACCESS_UNIFORM_READ_BIT;
       info.debugName = "Icb";
       
@@ -75,7 +75,8 @@ namespace dxvk {
         | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
       
       m_buffer = pDevice->GetDXVKDevice()->createBuffer(info, memFlags);
-      std::memcpy(m_buffer->mapPtr(0), shaderInfo.uniformData, shaderInfo.uniformSize);
+      std::memcpy(m_buffer->mapPtr(0), icb.data, icb.size);
+      std::memset(m_buffer->mapPtr(icb.size), 0, info.size - icb.size);
     }
 
     pDevice->GetDXVKDevice()->registerShader(m_shader);
diff --git a/src/dxbc/dxbc_compiler.cpp b/src/dxbc/dxbc_compiler.cpp
index d9d177109..f575dc04c 100644
--- a/src/dxbc/dxbc_compiler.cpp
+++ b/src/dxbc/dxbc_compiler.cpp
@@ -241,8 +241,6 @@ namespace dxvk {
     info.bindings = m_bindings.data();
     info.inputMask = m_inputMask;
     info.outputMask = m_outputMask;
-    info.uniformSize = m_icbData.size() * sizeof(uint32_t);
-    info.uniformData = reinterpret_cast<const char*>(m_icbData.data());
     info.pushConstStages = VK_SHADER_STAGE_FRAGMENT_BIT;
     info.pushConstSize = sizeof(DxbcPushConstants);
     info.outputTopology = m_outputTopology;
diff --git a/src/dxbc/dxbc_compiler.h b/src/dxbc/dxbc_compiler.h
index e47e31c5f..9cd8a0210 100644
--- a/src/dxbc/dxbc_compiler.h
+++ b/src/dxbc/dxbc_compiler.h
@@ -173,8 +173,8 @@ namespace dxvk {
 
     bool needsOutputSetup = false;
   };
-  
-  
+
+
   /**
    * \brief Pixel shader-specific structure
    */
@@ -404,6 +404,17 @@ namespace dxvk {
      * \returns The final shader object
      */
     Rc<DxvkShader> finalize();
+
+    /**
+     * \brief Extracts immediate constant buffer data
+     *
+     * Only defined if the ICB needs to be backed by a
+     * uniform buffer.
+     * \returns Immediate constant buffer data
+     */
+    std::vector<uint32_t> getIcbData() const {
+      return std::move(m_icbData);
+    }
     
   private:
     
diff --git a/src/dxbc/dxbc_module.cpp b/src/dxbc/dxbc_module.cpp
index 16e37ebbb..d542463ed 100644
--- a/src/dxbc/dxbc_module.cpp
+++ b/src/dxbc/dxbc_module.cpp
@@ -65,6 +65,8 @@ namespace dxvk {
     
     this->runCompiler(compiler, m_shexChunk->slice());
 
+    m_icb = compiler.getIcbData();
+
     return compiler.finalize();
   }
   
diff --git a/src/dxbc/dxbc_module.h b/src/dxbc/dxbc_module.h
index 7d6088bae..e1a713a43 100644
--- a/src/dxbc/dxbc_module.h
+++ b/src/dxbc/dxbc_module.h
@@ -18,6 +18,15 @@ namespace dxvk {
   class DxbcAnalyzer;
   class DxbcCompiler;
   
+  /**
+   * \brief Immediate constant buffer properties
+   */
+  struct DxbcIcbInfo {
+    size_t      size = 0u;
+    const void* data = nullptr;
+  };
+
+
   /**
    * \brief DXBC shader module
    * 
@@ -52,6 +61,19 @@ namespace dxvk {
       return m_bindings;
     }
 
+    /**
+     * \brief Retrieves immediate constant buffer info
+     *
+     * Only valid after successfully compiling the shader.
+     * \returns Immediate constant buffer data
+     */
+    DxbcIcbInfo icbInfo() const {
+      DxbcIcbInfo result = { };
+      result.size = m_icb.size() * sizeof(uint32_t);
+      result.data = m_icb.data();
+      return result;
+    }
+
     /**
      * \brief Input and output signature chunks
      * 
@@ -86,7 +108,7 @@ namespace dxvk {
     Rc<DxvkShader> compilePassthroughShader(
       const DxbcModuleInfo& moduleInfo,
       const std::string&    fileName) const;
-    
+
   private:
     
     DxbcHeader   m_header;
@@ -96,6 +118,8 @@ namespace dxvk {
     Rc<DxbcIsgn> m_psgnChunk;
     Rc<DxbcShex> m_shexChunk;
 
+    std::vector<uint32_t> m_icb;
+
     std::optional<DxbcBindingMask> m_bindings;
     
     void runAnalyzer(