diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
index fa3db1f7..3c3573fa 100644
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
@@ -41,9 +41,9 @@
      inkscape:window-height="705"
      id="namedview371"
      showgrid="true"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="990.71576"
-     inkscape:cy="484.51174"
+     inkscape:zoom="11.313709"
+     inkscape:cx="1211.5956"
+     inkscape:cy="524.36594"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -120,7 +120,7 @@
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 821.6363,593.11033 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z"
+       d="m 821.6363,592.59471 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z"
        id="path4353"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -1413,9 +1413,9 @@
      id="SlatIndicator"
      inkscape:label="#path1114" />
   <rect
-     style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:4.07583141;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:4.08072662;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
      id="FlapLine_clip"
-     width="193.06065"
+     width="193.52469"
      height="50.843338"
      x="718.86694"
      y="594.42938"
diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
index 96501c8c..6f2ef4b5 100644
--- a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
@@ -141,7 +141,7 @@
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 821.6363,593.11033 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z"
+       d="m 821.6363,592.59471 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z"
        id="path4353"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -1780,4 +1780,12 @@
      d="m 530.43575,645.52404 24.69434,-5.55908 -11.10498,15.46142 -24.69434,5.56055 z"
      id="SlatIndicator"
      inkscape:label="#path1114" />
+  <rect
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:4.08072662;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+     id="FlapLine_clip"
+     width="193.52469"
+     height="50.843338"
+     x="718.86694"
+     y="594.42938"
+     inkscape:label="#rect1023" />
 </svg>
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index 560414ce..58cb57c9 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -459,8 +459,8 @@
 				<table>
 					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
 					<entry><ind> 0.0</ind><dep>-47</dep></entry>
-					<entry><ind>10.0</ind><dep>-30</dep></entry>
-					<entry><ind>15.0</ind><dep>-20</dep></entry>
+					<entry><ind>10.0</ind><dep>-33</dep></entry>
+					<entry><ind>15.0</ind><dep>-21</dep></entry>
 					<entry><ind>20.0</ind><dep>-10</dep></entry>
 					<entry><ind>35.0</ind><dep>0</dep></entry>
 				</table>
@@ -477,8 +477,8 @@
 				<table>
 					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
 					<entry><ind> 0.0</ind><dep>-47</dep></entry>
-					<entry><ind>10.0</ind><dep>-30</dep></entry>
-					<entry><ind>15.0</ind><dep>-20</dep></entry>
+					<entry><ind>10.0</ind><dep>-33</dep></entry>
+					<entry><ind>15.0</ind><dep>-21</dep></entry>
 					<entry><ind>20.0</ind><dep>-10</dep></entry>
 					<entry><ind>40.0</ind><dep>0</dep></entry>
 				</table>
@@ -488,6 +488,94 @@
 		<output>/ECAM/Upper/FlapY</output>
 	</filter>
 	
+	<filter>
+		<name>Flap Indicator</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>options/maxflap</property>
+					<value>35</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
+					<entry><ind> 0.0</ind><dep>-198</dep></entry>
+					<entry><ind>10.0</ind><dep>-135</dep></entry>
+					<entry><ind>15.0</ind><dep>-95</dep></entry>
+					<entry><ind>20.0</ind><dep>-50</dep></entry>
+					<entry><ind>35.0</ind><dep>0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>options/maxflap</property>
+					<value>40</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
+					<entry><ind> 0.0</ind><dep>-198</dep></entry>
+					<entry><ind>10.0</ind><dep>-135</dep></entry>
+					<entry><ind>15.0</ind><dep>-95</dep></entry>
+					<entry><ind>20.0</ind><dep>-50</dep></entry>
+					<entry><ind>40.0</ind><dep>0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>0</input>
+		<output>/ECAM/Upper/FlapXtrans</output>
+	</filter>
+	
+	<filter>
+		<name>Flap Indicator</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>options/maxflap</property>
+					<value>35</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
+					<entry><ind> 0.0</ind><dep>-49</dep></entry>
+					<entry><ind>10.0</ind><dep>-33</dep></entry>
+					<entry><ind>15.0</ind><dep>-23</dep></entry>
+					<entry><ind>20.0</ind><dep>-12</dep></entry>
+					<entry><ind>35.0</ind><dep>0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>options/maxflap</property>
+					<value>40</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
+					<entry><ind> 0.0</ind><dep>-49</dep></entry>
+					<entry><ind>10.0</ind><dep>-33</dep></entry>
+					<entry><ind>15.0</ind><dep>-23</dep></entry>
+					<entry><ind>20.0</ind><dep>-12</dep></entry>
+					<entry><ind>40.0</ind><dep>0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>0</input>
+		<output>/ECAM/Upper/FlapYtrans</output>
+	</filter>
+	
 	<filter>
 		<name>Slat Indicator</name>
 		<type>gain</type>