diff --git a/css/app.css b/css/app.css
index 90401612c..53eec9933 100644
--- a/css/app.css
+++ b/css/app.css
@@ -14,7 +14,7 @@ body {
     height: 100%;
     width: 100%;
     position: fixed;
-    min-width: 760px;
+    min-width: 768px;
 }
 
 .limiter {
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 9078dea7b..3aca8caca 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -83,7 +83,6 @@ iD.ui.inspector = function() {
     }
 
     function drawButtons(selection) {
-<<<<<<< HEAD
         var inspectorButton1 = selection.append('div')
             .attr('class', 'button-wrap')
             .append('button')
diff --git a/js/id/ui/save.js b/js/id/ui/save.js
index 27d6ef1e5..95561da31 100644
--- a/js/id/ui/save.js
+++ b/js/id/ui/save.js
@@ -7,7 +7,7 @@ iD.ui.save = function() {
         var history = map.history(),
             connection = map.connection();
 
-        selection.html("<span class='icon icon-pre-text save'></span><span class='label'>Save</span><small id='as-username'></small>")
+        selection.html("<span class='label'>Save</span><small id='as-username'></small>")
             .attr('title', 'Save changes to OpenStreetMap, making them visible to other users')
             .property('disabled', true)
             .call(bootstrap.tooltip()