diff --git a/analysis/org.eclipse.tracecompass.analysis.counters.ui/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.counters.ui/plugin.xml
index c032d0d..d33de6c 100644
--- a/analysis/org.eclipse.tracecompass.analysis.counters.ui/plugin.xml
+++ b/analysis/org.eclipse.tracecompass.analysis.counters.ui/plugin.xml
@@ -5,14 +5,6 @@
          point="org.eclipse.ui.views">
       <view
             category="org.eclipse.linuxtools.lttng2.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.counters.ui.CounterView"
-            icon="icons/counter.png"
-            id="org.eclipse.tracecompass.analysis.counters.ui.view.counters"
-            name="%view.counters"
-            restorable="true">
-      </view>
-      <view
-            category="org.eclipse.linuxtools.lttng2.ui.views.category"
             class="org.eclipse.tracecompass.analysis.counters.ui.views.CounterView"
             icon="icons/counter.png"
             id="org.eclipse.tracecompass.analysis.counters.ui.views.countersview"
diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.timing.ui/plugin.xml
index 48b40dd..bda90b6 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/plugin.xml
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/plugin.xml
@@ -19,7 +19,7 @@
       </output>
       <output
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
-            id="org.eclipse.tracecompass.analysis.timing.ui.segstore.scatter:org.eclipse.tracecompass.internal.analysis.timing.core.event.matching">
+            id="org.eclipse.tracecompass.analysis.timing.ui.segstore.scatter2:org.eclipse.tracecompass.internal.analysis.timing.core.event.matching">
          <analysisId
                id="org.eclipse.tracecompass.internal.analysis.timing.core.event.matching">
          </analysisId>
@@ -45,14 +45,6 @@
       </view>
       <view
             category="org.eclipse.linuxtools.tmf.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.SegmentStoreScatterView"
-            icon="icons/eview16/latency.png"
-            id="org.eclipse.tracecompass.analysis.timing.ui.segstore.scatter"
-            name="%view.segstore.scatters"
-            restorable="true">
-      </view>
-      <view
-            category="org.eclipse.linuxtools.tmf.ui.views.category"
             class="org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.SegmentStoreScatterView2"
             icon="icons/eview16/latency.png"
             id="org.eclipse.tracecompass.analysis.timing.ui.segstore.scatter2"
@@ -79,9 +71,9 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng2.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.SegmentStoreScatterView"
+            class="org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.SegmentStoreScatterView2"
             icon="icons/eview16/statistics_view.gif"
-            id="org.eclipse.tracecompass.analysis.timing.ui.segstore.scatter:org.eclipse.tracecompass.internal.analysis.timing.core.event.matching"
+            id="org.eclipse.tracecompass.analysis.timing.ui.segstore.scatter2:org.eclipse.tracecompass.internal.analysis.timing.core.event.matching"
             name="%view.matching.scatter"
             restorable="true">
       </view>
diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/build.properties b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/build.properties
index 2f9bd97..5615c2f 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/build.properties
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/build.properties
@@ -20,6 +20,7 @@
                plugin.properties,\
                plugin.xml,\
                lttng-analyses-configs/,\
-               analysis.xml/
+               analysis.xml/,\
+               icons/
 src.includes = about.html,\
                analysis.xml/