diff --git a/motion/ruby_motion_query/image.rb b/motion/ruby_motion_query/image.rb
index db82246..8c88be1 100644
--- a/motion/ruby_motion_query/image.rb
+++ b/motion/ruby_motion_query/image.rb
@@ -17,7 +17,14 @@ module RubyMotionQuery
 
       # @return [UIImage]
       def resource_for_device(file_base_name, opts = {})
-        resource( RMQ.device.four_inch? ? "#{file_base_name}-568h" : file_base_name, opts)
+        ext = if RMQ.device.five_point_five_inch?
+          "-736h"
+        elsif RMQ.device.four_point_seven_inch?
+          "-667h"
+        elsif RMQ.device.four_inch?
+          "-568h"
+        end
+        resource("#{file_base_name}#{ext}")
       end
 
       # @return [UIImage]
diff --git a/spec/image.rb b/spec/image.rb
index f8ac125..284504d 100644
--- a/spec/image.rb
+++ b/spec/image.rb
@@ -1,13 +1,24 @@
 class RubyMotionQuery::Device
   class << self
-    def fake_four_inch(value)
-      @_four_inch = value
+    def fake_height(value)
+      @_three_point_five_inch = nil
+      @_four_inch = nil
+      @_four_point_seven_inch = nil
+      @_five_point_five_inch = nil
+      s = size_a
+      @_size_a[1] = value
     end
-    def reset_fake_four_inch
-      @_four_inch = (RubyMotionQuery::Device.height == 568.0)
+
+    def reset_fake_caches
+      @_three_point_five_inch = nil
+      @_four_inch = nil
+      @_four_point_seven_inch = nil
+      @_five_point_five_inch = nil
+      @_size_a = nil
     end
   end
 end
+
 describe 'image' do
   before do
     @rmq = RubyMotionQuery::RMQ
@@ -29,21 +40,37 @@ describe 'image' do
   end
 
   describe "resource_for_device" do
-    it "should return the requested file as is if we arent on a 4 inch" do
-      @rmq.device.fake_four_inch(false)
+    it "should get the correct image size for a three point five inch device" do
+      @rmq.device.fake_height(480)
       image = @rmq.image.resource_for_device('Default')
-      @rmq.device.reset_fake_four_inch
+      @rmq.device.reset_fake_caches
       image.is_a?(UIImage).should.be.true
       image.size.height.should == 480
     end
 
     it "should get the -568h image on a four inch" do
-      @rmq.device.fake_four_inch(true)
+      @rmq.device.fake_height(568)
       image = @rmq.image.resource_for_device('Default')
-      @rmq.device.reset_fake_four_inch
+      @rmq.device.reset_fake_caches
       image.is_a?(UIImage).should.be.true
       image.size.height.should == 568
     end
+
+    it "should get the -667h image on a four point seven inch" do
+      @rmq.device.fake_height(667)
+      image = @rmq.image.resource_for_device('Default')
+      @rmq.device.reset_fake_caches
+      image.is_a?(UIImage).should.be.true
+      image.size.height.should == 667
+    end
+
+    it "should get the -736h image on a five point five inch" do
+      @rmq.device.fake_height(736)
+      image = @rmq.image.resource_for_device('Default')
+      @rmq.device.reset_fake_caches
+      image.is_a?(UIImage).should.be.true
+      image.size.height.should == 736
+    end
   end
 
   describe "resource_resizable" do