diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb
index 6ff47c4033abcc73a5ad982e627ca663013c1036..6d4d43609885b1fb0101dbc9204b80f2fc05fcf6 100644
--- a/app/controllers/projects/badges_controller.rb
+++ b/app/controllers/projects/badges_controller.rb
@@ -2,11 +2,12 @@ class Projects::BadgesController < Projects::ApplicationController
   before_action :no_cache_headers
 
   def build
+    badge = Gitlab::Badge::Build.new(project, params[:ref])
+
     respond_to do |format|
       format.html { render_404 }
       format.svg do
-        image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref])
-        send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
+        send_data(badge.data, type: badge.type, disposition: 'inline')
       end
     end
   end
diff --git a/lib/gitlab/badge/build.rb b/lib/gitlab/badge/build.rb
new file mode 100644
index 0000000000000000000000000000000000000000..28a2391dbf82e76a2fef84c9acbf3a6f54992c68
--- /dev/null
+++ b/lib/gitlab/badge/build.rb
@@ -0,0 +1,24 @@
+module Gitlab
+  module Badge
+    ##
+    # Build badge
+    #
+    class Build
+      def initialize(project, ref)
+        @image = ::Ci::ImageForBuildService.new.execute(project, ref: ref)
+      end
+
+      def to_s
+        @image[:name].sub(/\.svg$/, '')
+      end
+
+      def type
+        'image/svg+xml'
+      end
+
+      def data
+        File.read(@image[:path])
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e835de5e07dba4aa0693fb1a412c9b2c8b3ba2f9
--- /dev/null
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Gitlab::Badge::Build do
+  let(:project) { create(:project) }
+  let(:sha) { project.commit.sha }
+  let(:ci_commit) { create(:ci_commit, project: project, sha: sha) }
+  let(:badge) { described_class.new(project, 'master') }
+
+  let!(:build) { create(:ci_build, commit: ci_commit) }
+
+  describe '#type' do
+    subject { badge.type }
+    it { is_expected.to eq 'image/svg+xml' }
+  end
+
+  context 'build success' do
+    before { build.success! }
+
+    describe '#to_s' do
+      subject { badge.to_s }
+      it { is_expected.to eq 'build-success' }
+    end
+
+    describe '#data' do
+      let(:data) { badge.data }
+      let(:xml) { Nokogiri::XML.parse(data) }
+
+      it 'contains infromation about success' do
+        expect(xml.at(%Q{text:contains("success")})).to be_truthy
+      end
+    end
+  end
+end