diff --git a/src/lay/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc
index 81c8c6290..897a996cd 100644
--- a/src/lay/lay/layMacroEditorDialog.cc
+++ b/src/lay/lay/layMacroEditorDialog.cc
@@ -3475,7 +3475,7 @@ public:
     options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_save_all_on_run, "false"));
     options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_debugging_enabled, "true"));
     options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_file_watcher_enabled, "true"));
-    options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_font_size, ""));
+    options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_font_size, "0"));
     options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_font_family, ""));
     options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_stop_on_exception, "true"));
     options.push_back (std::pair<std::string, std::string> (cfg_macro_editor_tab_width, "8"));
diff --git a/src/laybasic/laybasic/SaveLayoutAsOptionsDialog.ui b/src/laybasic/laybasic/SaveLayoutAsOptionsDialog.ui
index 3c8e155a2..90863d2ce 100644
--- a/src/laybasic/laybasic/SaveLayoutAsOptionsDialog.ui
+++ b/src/laybasic/laybasic/SaveLayoutAsOptionsDialog.ui
@@ -1,10 +1,11 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SaveLayoutAsOptionsDialog</class>
- <widget class="QDialog" name="SaveLayoutAsOptionsDialog" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="SaveLayoutAsOptionsDialog">
+  <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,47 +13,65 @@
     <height>599</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
    <item>
-    <widget class="QFrame" name="frame" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="leftMargin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="topMargin">
+       <number>9</number>
+      </property>
+      <property name="rightMargin">
+       <number>9</number>
+      </property>
+      <property name="bottomMargin">
+       <number>9</number>
+      </property>
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
          <string>File</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
+      <item row="1" column="2">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>31</width>
           <height>20</height>
@@ -60,54 +79,50 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_2" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
          <string>Format</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QComboBox" name="fmt_cbx" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="fmt_cbx">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>2</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="3" >
-       <widget class="QLabel" name="filename_lbl" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>5</vsizetype>
+      <item row="0" column="1" colspan="3">
+       <widget class="QLabel" name="filename_lbl">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" colspan="2" >
-       <widget class="QComboBox" name="compression" >
+      <item row="1" column="3" colspan="2">
+       <widget class="QComboBox" name="compression">
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Auto compression</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>No compression</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>ZLib compression</string>
          </property>
         </item>
@@ -117,55 +132,62 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Generic Options</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="leftMargin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="topMargin">
+       <number>9</number>
+      </property>
+      <property name="rightMargin">
+       <number>9</number>
+      </property>
+      <property name="bottomMargin">
+       <number>9</number>
+      </property>
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="2" >
-       <widget class="QLabel" name="label_7" >
-        <property name="text" >
+      <item row="1" column="2">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
          <string>µm</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
          <string>Database unit</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="5" >
-       <widget class="QLineEdit" name="sf_le" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="1" column="5">
+       <widget class="QLineEdit" name="sf_le">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="6" >
+      <item row="1" column="6">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>51</width>
           <height>32</height>
@@ -173,74 +195,72 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="4" >
-       <widget class="QLabel" name="label_6" >
-        <property name="text" >
+      <item row="1" column="4">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
          <string>Scaling factor</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="6" >
-       <widget class="QFrame" name="frame_2" >
-        <property name="frameShape" >
+      <item row="2" column="1" colspan="6">
+       <widget class="QFrame" name="frame_2">
+        <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
-        <property name="frameShadow" >
+        <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" >
-         <property name="margin" >
+        <layout class="QGridLayout">
+         <property name="leftMargin">
           <number>0</number>
          </property>
-         <property name="spacing" >
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <property name="spacing">
           <number>6</number>
          </property>
-         <item row="0" column="0" colspan="3" >
-          <widget class="QCheckBox" name="no_empty_cells_cb" >
-           <property name="text" >
-            <string>Write non-empty cells only (skip empty cells)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="4" >
-          <widget class="QCheckBox" name="no_hidden_cells_cb" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>1</hsizetype>
-             <vsizetype>0</vsizetype>
+         <item row="1" column="0" colspan="4">
+          <widget class="QCheckBox" name="no_hidden_cells_cb">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>Write visible cells only (skip cells not shown with content)</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="1" colspan="3" >
-          <widget class="QCheckBox" name="keep_instances_cb" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>0</vsizetype>
+         <item row="2" column="1" colspan="3">
+          <widget class="QCheckBox" name="keep_instances_cb">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>Keep instances for dropped cells (make ghost cells)</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="0" >
+         <item row="2" column="0">
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeType" >
+           <property name="sizeType">
             <enum>QSizePolicy::Fixed</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>20</height>
@@ -248,51 +268,58 @@
            </property>
           </spacer>
          </item>
+         <item row="0" column="0" colspan="4">
+          <widget class="QCheckBox" name="no_empty_cells_cb">
+           <property name="text">
+            <string>Don't write empty cells</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
          <string>Layers to save</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="6" >
-       <widget class="QComboBox" name="layersel_cbx" >
+      <item row="0" column="1" colspan="6">
+       <widget class="QComboBox" name="layersel_cbx">
         <item>
-         <property name="text" >
+         <property name="text">
           <string>All layers</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Layers shown in list</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Visible layers only</string>
          </property>
         </item>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_8" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
          <string>Cell tree</string>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" >
+      <item row="1" column="3">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -300,31 +327,29 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="dbu_le" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="dbu_le">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="6" >
-       <widget class="QCheckBox" name="store_context_cb" >
-        <property name="text" >
+      <item row="3" column="1" colspan="6">
+       <widget class="QCheckBox" name="store_context_cb">
+        <property name="text">
          <string>Store PCell and library context information (format specific)</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
          <string>Cell context</string>
         </property>
        </widget>
@@ -333,25 +358,23 @@
     </widget>
    </item>
    <item>
-    <widget class="QStackedWidget" name="options_stack" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>7</vsizetype>
+    <widget class="QStackedWidget" name="options_stack">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <widget class="QWidget" name="page_3" />
-     <widget class="QWidget" name="page_4" />
+     <widget class="QWidget" name="page_3"/>
+     <widget class="QWidget" name="page_4"/>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>509</width>
        <height>16</height>
@@ -360,19 +383,19 @@
     </spacer>
    </item>
    <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -398,11 +421,11 @@
    <receiver>SaveLayoutAsOptionsDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
diff --git a/src/laybasic/laybasic/layBitmapsToImage.cc b/src/laybasic/laybasic/layBitmapsToImage.cc
index 6c48a34fb..3a7f18ca4 100644
--- a/src/laybasic/laybasic/layBitmapsToImage.cc
+++ b/src/laybasic/laybasic/layBitmapsToImage.cc
@@ -527,7 +527,8 @@ bitmaps_to_image_rgb (const std::vector<lay::ViewOp> &view_ops_in,
     
     masks.erase (masks.begin (), masks.end ());
 
-    uint32_t needed_bits = 0xffffff; // alpha channel not needed
+    const uint32_t needed_bits = 0x00ffffff; // alpha channel not needed
+    const uint32_t fill_bits   = 0xff000000; // fill alpha value with ones
     uint32_t *dptr = buffer;
     uint32_t ne_mask = (1 << (y % slice));
     for (unsigned int i = 0; i < view_ops.size (); ++i) {
@@ -583,10 +584,10 @@ bitmaps_to_image_rgb (const std::vector<lay::ViewOp> &view_ops_in,
       for (unsigned int x = 0; x < width; x += 32, ++i) {
 
         lay::color_t y[32] = {
-          0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0,
+          fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits,
+          fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits,
+          fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits,
+          fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits, fill_bits,
         };
 
         lay::color_t z[32] = {