diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea1d3ced2..4a72d02c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@
 * Add DAPSI to our sponsor list
 * checkup
   * check for duplicate or incorrect headers
+* save rendered markmap, mathjax, and mermaid as images
+* guard against incorrect iPhone behaviour that broke the ability to toggle between grid and list mode
 
 # 4.4.0
 
diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 1b9e0b2e3..d287951b5 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -897,7 +897,12 @@
         .cp-toolbar-bottom-right {
             .fa-history { order: 50; }
             // .fa-list, .fa-th-large,
-            .cp-drive-viewmode-button { order: 25; }
+            .cp-app-drive-viewmode-button {
+                order: 25;
+                i {
+                    margin-right: 0;
+                }
+            }
             #cp-app-drive-toolbar-context-mobile, #cp-app-drive-toolbar-contextbuttons { order: 0; }
             #cp-app-drive-toolbar-context-mobile {
                 .fa { margin: 0 !important; }
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index a1084fd83..87c40ffd4 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2416,10 +2416,10 @@ define([
         // Create the button allowing the user to switch from list to icons modes
         var createViewModeButton = function ($container) {
             var viewMode = getViewMode();
-            var gridIcon = h('button.fa.fa-th-large', { title: Messages.fm_viewGridButton });
-            var listIcon = h('button.fa.fa-list', { title: Messages.fm_viewListButton });
+            var gridIcon = h('i.fa.fa-th-large', { title: Messages.fm_viewGridButton });
+            var listIcon = h('i.fa.fa-list', { title: Messages.fm_viewListButton });
 
-            var $button = $(h('span.cp-drive-viewmode-button', [
+            var $button = $(h('button.cp-app-drive-viewmode-button', [
                 gridIcon,
                 listIcon
             ]));