diff --git a/static/css/pad.css b/static/css/pad.css
index a1c48ce2..933b7af1 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1178,7 +1178,7 @@ label[for=readonlyinput] {
   }  
 }
 
-@media only screen and (min-device-width: 320px) and (max-device-width: 600px) {
+@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
   #editbar ul li {
     padding: 4px 3px;
   }
@@ -1190,12 +1190,10 @@ label[for=readonlyinput] {
     opacity: .8;
   }
   #users {
-    right: none;
-    left: 30px;
+    right: 4px;
   }
   #mycolorpicker {
-    right: 0;
-    left: 0 !important;
+    left: -72px; /* #mycolorpicker:width - #users:width */
   }
   #editorcontainer {
     margin-bottom: 33px;
@@ -1246,9 +1244,6 @@ label[for=readonlyinput] {
   #usericonback {
     margin-top: 4px;
   }
-  #sidediv {
-    display:none;
-  }
 }
 .rtl{
   direction:RTL;
diff --git a/static/js/ace2_inner.js b/static/js/ace2_inner.js
index aa1ca766..bad0ca34 100644
--- a/static/js/ace2_inner.js
+++ b/static/js/ace2_inner.js
@@ -85,6 +85,11 @@ function OUTER(gscope)
   var doesWrap = true;
   var hasLineNumbers = true;
   var isStyled = true;
+  
+  // check for mobile os presence
+  var ua = navigator.userAgent.toLowerCase();
+  var isAndroid = ua.indexOf("android") > -1;
+  var isMobileSafari = ua.indexOf("mobile") > -1;
 
   // space around the innermost iframe element
   var iframePadLeft = MIN_LINEDIV_WIDTH + LINE_NUMBER_PADDING_RIGHT + EDIT_BODY_PADDING_LEFT;
@@ -1105,6 +1110,8 @@ function OUTER(gscope)
     else if (k == "showslinenumbers")
     {
       hasLineNumbers = !! value;
+      // disable line numbers on mobile devices
+      if(isAndroid || isMobileSafari) hasLineNumbers = false;
       setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers);
       fixView();
     }