diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 869f079d3..796640f6d 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -927,7 +927,9 @@ define([
             }
 
             var $importTemplateButton = common.createButton('importtemplate', true);
-            toolbar.$drawer.append($importTemplateButton);
+            if (!readOnly) {
+                toolbar.$drawer.append($importTemplateButton);
+            }
 
             /* add a forget button */
             toolbar.$drawer.append(common.createButton('forget', true, {}, function (err) {
diff --git a/www/form/app-form.less b/www/form/app-form.less
index b9aa77964..07d7e0087 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -37,7 +37,7 @@
         }
     }
 
-    &.cp-readonly {
+    &.cp-form-readonly {
         .cp-form-creator-inline-add {
             display: none;
         }
diff --git a/www/form/inner.js b/www/form/inner.js
index fa6fc6b63..7c21f7083 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2340,19 +2340,21 @@ define([
             if (editable) {
                 if (APP.mainSortable) { APP.mainSortable.options.filter = oldFilter; }
                 if (!APP.isEditor) { $(offlineEl).remove(); }
-                $body.removeClass('cp-readonly');
+                $body.removeClass('cp-form-readonly');
             } else {
                 if (APP.mainSortable) {
                     oldFilter = APP.mainSortable.options.filter;
                     APP.mainSortable.options.filter = function () { return true; };
                 }
                 if (!APP.isEditor) { $('.cp-help-container').before(offlineEl); }
-                $body.addClass('cp-readonly');
+                $body.addClass('cp-form-readonly');
             }
         });
 
         if (!APP.isEditor) {
             framework._.toolbar.alone();
+            $('.cp-toolbar-icon-history').hide();
+            $('.cp-toolbar-icon-snapshots').hide();
         }
 
         var makeFormSettings = function () {