diff --git a/icons/arrow-disabled.png b/icons/arrow-disabled.png
new file mode 100644
index 000000000..b0e6d8efb
Binary files /dev/null and b/icons/arrow-disabled.png differ
diff --git a/icons/beam-disabled.png b/icons/beam-disabled.png
new file mode 100644
index 000000000..91f3ebd4c
Binary files /dev/null and b/icons/beam-disabled.png differ
diff --git a/icons/ff-disabled.png b/icons/ff-disabled.png
new file mode 100644
index 000000000..50ecb1538
Binary files /dev/null and b/icons/ff-disabled.png differ
diff --git a/icons/icons.qrc b/icons/icons.qrc
index 009e0d108..e94bd87d4 100644
--- a/icons/icons.qrc
+++ b/icons/icons.qrc
@@ -15,5 +15,17 @@
         <file>ripple.png</file>
         <file>rolling.png</file>
         <file>slip.png</file>
+        <file>ff-disabled.png</file>
+        <file>next-disabled.png</file>
+        <file>pause-disabled.png</file>
+        <file>play-disabled.png</file>
+        <file>prev-disabled.png</file>
+        <file>rew-disabled.png</file>
+        <file>arrow-disabled.png</file>
+        <file>beam-disabled.png</file>
+        <file>razor-disabled.png</file>
+        <file>ripple-disabled.png</file>
+        <file>rolling-disabled.png</file>
+        <file>slip-disabled.png</file>
     </qresource>
 </RCC>
diff --git a/icons/next-disabled.png b/icons/next-disabled.png
new file mode 100644
index 000000000..49e21fe20
Binary files /dev/null and b/icons/next-disabled.png differ
diff --git a/icons/pause-disabled.png b/icons/pause-disabled.png
new file mode 100644
index 000000000..75046c8ef
Binary files /dev/null and b/icons/pause-disabled.png differ
diff --git a/icons/play-disabled.png b/icons/play-disabled.png
new file mode 100644
index 000000000..c135ad1c9
Binary files /dev/null and b/icons/play-disabled.png differ
diff --git a/icons/prev-disabled.png b/icons/prev-disabled.png
new file mode 100644
index 000000000..db5a44fe1
Binary files /dev/null and b/icons/prev-disabled.png differ
diff --git a/icons/razor-disabled.png b/icons/razor-disabled.png
new file mode 100644
index 000000000..8e69b117d
Binary files /dev/null and b/icons/razor-disabled.png differ
diff --git a/icons/rew-disabled.png b/icons/rew-disabled.png
new file mode 100644
index 000000000..216e22fcf
Binary files /dev/null and b/icons/rew-disabled.png differ
diff --git a/icons/ripple-disabled.png b/icons/ripple-disabled.png
new file mode 100644
index 000000000..79cc89bb2
Binary files /dev/null and b/icons/ripple-disabled.png differ
diff --git a/icons/rolling-disabled.png b/icons/rolling-disabled.png
new file mode 100644
index 000000000..cbcb24132
Binary files /dev/null and b/icons/rolling-disabled.png differ
diff --git a/icons/slip-disabled.png b/icons/slip-disabled.png
new file mode 100644
index 000000000..57012f76f
Binary files /dev/null and b/icons/slip-disabled.png differ
diff --git a/panels/timeline.cpp b/panels/timeline.cpp
index b9cc21533..7059022f2 100644
--- a/panels/timeline.cpp
+++ b/panels/timeline.cpp
@@ -113,6 +113,7 @@ void Timeline::update_sequence() {
 	for (int i=0;i<tool_buttons.count();i++) {
 		tool_buttons[i]->setEnabled(!null_sequence);
 	}
+    ui->snappingButton->setEnabled(!null_sequence);
 	ui->pushButton_4->setEnabled(!null_sequence);
 	ui->pushButton_5->setEnabled(!null_sequence);
     ui->headers->setEnabled(!null_sequence);
diff --git a/panels/timeline.ui b/panels/timeline.ui
index 08afe0588..b00f79f8c 100644
--- a/panels/timeline.ui
+++ b/panels/timeline.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>523</width>
-    <height>227</height>
+    <height>363</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -82,7 +82,8 @@
          </property>
          <property name="icon">
           <iconset resource="../icons/icons.qrc">
-           <normaloff>:/icons/arrow.png</normaloff>:/icons/arrow.png</iconset>
+           <normaloff>:/icons/arrow.png</normaloff>
+           <disabledoff>:/icons/arrow-disabled.png</disabledoff>:/icons/arrow.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -111,7 +112,8 @@
          </property>
          <property name="icon">
           <iconset resource="../icons/icons.qrc">
-           <normaloff>:/icons/beam.png</normaloff>:/icons/beam.png</iconset>
+           <normaloff>:/icons/beam.png</normaloff>
+           <disabledoff>:/icons/beam-disabled.png</disabledoff>:/icons/beam.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -140,7 +142,8 @@
          </property>
          <property name="icon">
           <iconset resource="../icons/icons.qrc">
-           <normaloff>:/icons/ripple.png</normaloff>:/icons/ripple.png</iconset>
+           <normaloff>:/icons/ripple.png</normaloff>
+           <disabledoff>:/icons/ripple-disabled.png</disabledoff>:/icons/ripple.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -169,7 +172,8 @@
          </property>
          <property name="icon">
           <iconset resource="../icons/icons.qrc">
-           <normaloff>:/icons/rolling.png</normaloff>:/icons/rolling.png</iconset>
+           <normaloff>:/icons/rolling.png</normaloff>
+           <disabledoff>:/icons/rolling-disabled.png</disabledoff>:/icons/rolling.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -192,7 +196,8 @@
          </property>
          <property name="icon">
           <iconset resource="../icons/icons.qrc">
-           <normaloff>:/icons/razor.png</normaloff>:/icons/razor.png</iconset>
+           <normaloff>:/icons/razor.png</normaloff>
+           <disabledoff>:/icons/razor-disabled.png</disabledoff>:/icons/razor.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -222,6 +227,7 @@
          <property name="icon">
           <iconset>
            <normalon>:/icons/slip.png</normalon>
+           <disabledoff>:/icons/slip-disabled.png</disabledoff>
           </iconset>
          </property>
          <property name="checkable">
@@ -312,8 +318,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>479</width>
-         <height>198</height>
+         <width>468</width>
+         <height>309</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/panels/viewer.ui b/panels/viewer.ui
index 3574ae610..8ef5d0b8c 100644
--- a/panels/viewer.ui
+++ b/panels/viewer.ui
@@ -127,7 +127,8 @@
            </property>
            <property name="icon">
             <iconset resource="../icons/icons.qrc">
-             <normaloff>:/icons/prev.png</normaloff>:/icons/prev.png</iconset>
+             <normaloff>:/icons/prev.png</normaloff>
+             <disabledoff>:/icons/prev-disabled.png</disabledoff>:/icons/prev.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -162,7 +163,8 @@
            </property>
            <property name="icon">
             <iconset resource="../icons/icons.qrc">
-             <normaloff>:/icons/rew.png</normaloff>:/icons/rew.png</iconset>
+             <normaloff>:/icons/rew.png</normaloff>
+             <disabledoff>:/icons/rew-disabled.png</disabledoff>:/icons/rew.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -196,9 +198,9 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset>
-             <normalon>:/icons/play.png</normalon>
-            </iconset>
+            <iconset resource="../icons/icons.qrc">
+             <normaloff>:/icons/play.png</normaloff>
+             <disabledoff>:/icons/play-disabled.png</disabledoff>:/icons/play.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -234,6 +236,7 @@
            <property name="icon">
             <iconset>
              <normalon>:/icons/ff.png</normalon>
+             <disabledoff>:/icons/ff-disabled.png</disabledoff>
             </iconset>
            </property>
            <property name="iconSize">
@@ -269,7 +272,8 @@
            </property>
            <property name="icon">
             <iconset resource="../icons/icons.qrc">
-             <normaloff>:/icons/next.png</normaloff>:/icons/next.png</iconset>
+             <normaloff>:/icons/next.png</normaloff>
+             <disabledoff>:/icons/next-disabled.png</disabledoff>:/icons/next.png</iconset>
            </property>
            <property name="iconSize">
             <size>