 	_calculatePhoneScale: ->
 
 		# Calculates a phone scale that fits the screen unless a fixed value is set
-
-		[width, height] = @_getOrientationDimensions(@phone.width, @phone.height)
-
-		paddingOffset = @_device?.paddingOffset or 0
+		dimension = if @showBezel then @phone else @screen
+
+		[width, height] = @_getOrientationDimensions(dimension.width, dimension.height)
+
+		if @showBezel
+			paddingOffset = @_device?.paddingOffset or 0
+			padding = (@padding + paddingOffset) * 2
+		else
+			padding = 0
 
 		phoneScale = _.min([
-			(window.innerWidth  - ((@padding + paddingOffset) * 2)) / width,
-			(window.innerHeight - ((@padding + paddingOffset) * 2)) / height
+			(window.innerWidth  - padding) / width,
+			(window.innerHeight - padding) / height
 		])
 
 		# Never scale the phone beyond 100%
-		phoneScale = 1 if phoneScale > 1
+		phoneScale = 1 if phoneScale > 1 and @showBezel
 
 		@emit("change:phoneScale", phoneScale)
 

	# HANDS

	handSwitchingSupported: ->
		return @_device.hands isnt undefined

	nextHand: ->
		return if @hands.rotationZ isnt 0


		return "#{resourceUrl}/#{name}"

	@define "showBezel",
		get: ->
			return @_showBezel ? true
		set: (showBezel) ->
			@_showBezel = showBezel
			@_update()

	###########################################################################
	# DEVICE ZOOM

