diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index 2acc8bc1f..5a0fd115c 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -126,7 +126,7 @@ class FactEditor(object):
         self.clayout.setSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred)
         self.clayout.setFixedHeight(20)
         # self.clayout.setFixedWidth(48)
-        self.clayout.setIcon(QIcon(":/icons/edit.png"))
+        self.clayout.setIcon(QIcon(":/icons/layout.png"))
         #self.clayout.setIconSize(QSize(32,32))
         self.clayout.setToolTip(_("Edit how cards are displayed (F2)"))
         self.clayout.setShortcut(_("F2"))
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 542ba2f0d..3c2af1e79 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -1787,6 +1787,7 @@ learnt today")
         mw = self.mainWin
         mw.toolBar.addAction(mw.actionAddcards)
         mw.toolBar.addAction(mw.actionEditCurrent)
+        mw.toolBar.addAction(mw.actionEditLayout)
         mw.toolBar.addAction(mw.actionEditdeck)
         mw.toolBar.addAction(mw.actionStudyOptions)
         mw.toolBar.addAction(mw.actionGraphs)
@@ -1911,6 +1912,10 @@ learnt today")
     def onEditCurrent(self):
         self.moveToState("editCurrentFact")
 
+    def onCardLayout(self):
+        ui.clayout.CardLayout(self, None, self.currentCard.fact.model,
+                              card=self.currentCard)
+
     def onDeckProperties(self):
         self.deckProperties = ui.deckproperties.DeckProperties(self, self.deck)
 
@@ -2433,6 +2438,7 @@ This deck already exists on your computer. Overwrite the local copy?"""),
         self.connect(m.actionDstats, s, self.onDeckStats)
         self.connect(m.actionCstats, s, self.onCardStats)
         self.connect(m.actionGraphs, s, self.onShowGraph)
+        self.connect(m.actionEditLayout, s, self.onCardLayout)
         self.connect(m.actionAbout, s, self.onAbout)
         self.connect(m.actionReportbug, s, self.onReportBug)
         self.connect(m.actionForum, s, self.onForum)
@@ -2512,6 +2518,7 @@ This deck already exists on your computer. Overwrite the local copy?"""),
     def disableCardMenuItems(self):
         self.maybeEnableUndo()
         self.mainWin.actionEditCurrent.setEnabled(False)
+        self.mainWin.actionEditLayout.setEnabled(False)
 	self.mainWin.actionMarkCard.setEnabled(False)
 	self.mainWin.actionSuspendCard.setEnabled(False)
 	self.mainWin.actionDelete.setEnabled(False)
@@ -2524,6 +2531,7 @@ This deck already exists on your computer. Overwrite the local copy?"""),
         snd = (hasSound(self.currentCard.question) or
                (hasSound(self.currentCard.answer) and
                 self.state != "getQuestion"))
+	self.mainWin.actionEditLayout.setEnabled(True)
         self.mainWin.actionRepeatAudio.setEnabled(snd)
 	self.mainWin.actionMarkCard.setEnabled(True)
 	self.mainWin.actionSuspendCard.setEnabled(True)
diff --git a/designer/main.ui b/designer/main.ui
index cca4705f2..d6e1542f4 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -3029,6 +3029,7 @@
     <addaction name="separator"/>
     <addaction name="actionAddcards"/>
     <addaction name="actionEditCurrent"/>
+    <addaction name="actionEditLayout"/>
     <addaction name="actionEditdeck"/>
     <addaction name="separator"/>
     <addaction name="actionMarkCard"/>
@@ -3580,7 +3581,7 @@
      <normaloff>:/icons/edit-rename.png</normaloff>:/icons/edit-rename.png</iconset>
    </property>
    <property name="text">
-    <string>Edit &amp;Current...</string>
+    <string>&amp;Current Fact...</string>
    </property>
    <property name="statusTip">
     <string/>
@@ -3743,6 +3744,18 @@
     <string>Save media files using original file names</string>
    </property>
   </action>
+  <action name="actionEditLayout">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/layout.png</normaloff>:/icons/layout.png</iconset>
+   </property>
+   <property name="text">
+    <string>Card Layout...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+L</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>easeButton3</tabstop>
diff --git a/designer/modelproperties.ui b/designer/modelproperties.ui
index 65dfc41d6..b3feb9a6b 100644
--- a/designer/modelproperties.ui
+++ b/designer/modelproperties.ui
@@ -151,6 +151,10 @@
             <property name="text">
              <string>Card &amp;Layout</string>
             </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/layout.png</normaloff>:/icons/layout.png</iconset>
+            </property>
            </widget>
           </item>
          </layout>
@@ -185,7 +189,9 @@
   <tabstop>cardLayout</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/icons.qrc b/icons.qrc
index add069489..230974765 100644
--- a/icons.qrc
+++ b/icons.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/">
+    <file>icons/layout.png</file>
     <file>icons/generate_07.png</file>
     <file>icons/view-sort-descending.png</file>
     <file>icons/emblem-important.png</file>
diff --git a/icons/layout.png b/icons/layout.png
new file mode 100644
index 000000000..2ad40bd84
Binary files /dev/null and b/icons/layout.png differ