diff --git a/engine/core/loader/CanvasImageLoader.cpp b/engine/core/loader/CanvasImageLoader.cpp
index fd325826a92..a7175dc5079 100644
--- a/engine/core/loader/CanvasImageLoader.cpp
+++ b/engine/core/loader/CanvasImageLoader.cpp
@@ -5,15 +5,15 @@
 #include "sky/engine/config.h"
 #include "sky/engine/core/loader/CanvasImageLoader.h"
 #include "sky/engine/core/painting/CanvasImage.h"
-#include "sky/engine/platform/image-decoders/ImageDecoder.h"
+#include "sky/engine/core/script/dom_dart_state.h"
 #include "sky/engine/platform/SharedBuffer.h"
+#include "sky/engine/platform/image-decoders/ImageDecoder.h"
 
 namespace blink {
 
 CanvasImageLoader::CanvasImageLoader(const String& src, PassOwnPtr<ImageLoaderCallback> callback)
   : callback_(callback) {
-  // TODO(jackson): Figure out how to determine the proper base URL here
-  KURL url = KURL(KURL(), src);
+  KURL url = KURL(DOMDartState::Current()->url(), src);
   fetcher_ = adoptPtr(new MojoFetcher(this, url));
 }
 
diff --git a/sdk/lib/framework/components2/icon.dart b/sdk/lib/framework/components2/icon.dart
index 85b957f2b95..2d31def8359 100644
--- a/sdk/lib/framework/components2/icon.dart
+++ b/sdk/lib/framework/components2/icon.dart
@@ -10,7 +10,7 @@ import '../rendering/box.dart';
 const String kAssetBase = '/packages/sky/assets/material-design-icons';
 
 class Icon extends Component {
-  double size;
+  int size;
   String type;
 
   Icon({
@@ -28,7 +28,7 @@ class Icon extends Component {
       subtype = parts[1];
     }
     return new Image(
-      size: new sky.Size(size, size),
+      size: new sky.Size(size.toDouble(), size.toDouble()),
       src: '${kAssetBase}/${category}/2x_web/ic_${subtype}_${size}dp.png'
     );
   }
diff --git a/sdk/lib/framework/components2/icon_button.dart b/sdk/lib/framework/components2/icon_button.dart
index 8af50e259d8..9fc79dee597 100644
--- a/sdk/lib/framework/components2/icon_button.dart
+++ b/sdk/lib/framework/components2/icon_button.dart
@@ -16,7 +16,7 @@ class IconButton extends Component {
   UINode build() {
     return new EventListenerNode(
       new Padding(
-        child: new Icon(type: icon, size: 24.0),
+        child: new Icon(type: icon, size: 24),
         padding: const EdgeDims.all(8.0)),
       onGestureTap: onGestureTap);
   }
diff --git a/sdk/lib/framework/components2/menu_item.dart b/sdk/lib/framework/components2/menu_item.dart
index e179016b648..99c8de22fd5 100644
--- a/sdk/lib/framework/components2/menu_item.dart
+++ b/sdk/lib/framework/components2/menu_item.dart
@@ -44,7 +44,7 @@ class MenuItem extends ButtonBase {
           children: [
             new StyleNode(
               new Icon(
-                size: 24.0,
+                size: 24,
                 type: "${icon}_grey600"
               ),
               _iconStyle