diff --git a/src/lte/doc/source/figures/lte-enb-rrc-states.dot b/src/lte/doc/source/figures/lte-enb-rrc-states.dot
index 9ab3e97dd..7d0cf2b92 100644
--- a/src/lte/doc/source/figures/lte-enb-rrc-states.dot
+++ b/src/lte/doc/source/figures/lte-enb-rrc-states.dot
@@ -1,37 +1,40 @@
 digraph LteEnbRrcStates {
 
-size="20,20"
-
 
 NO_CONTEXT [shape="ellipse", label="no context"]
-INITIAL_RANDOM_ACCESS  [shape="box",width=4]
-CONNECTION_SETUP [shape="box",width=4]
-CONNECTION_REJECTED [shape="box",width=4] 
-CONNECTED_NORMALLY [shape="box",width=4] 
-CONNECTION_RECONFIGURATION [shape="box",width=4] 
-HANDOVER_PREPARATION [shape="box",width=4] 
-HANDOVER_JOINING [shape="box",width=4] 
-HANDOVER_PATH_SWITCH [shape="box",width=4] 
-HANDOVER_LEAVING [shape="box",width=4]
+INITIAL_RANDOM_ACCESS [shape="box",width=3]
+CONNECTION_SETUP [shape="box",width=3]
+CONNECTION_REJECTED [shape="box",width=3] 
+CONNECTED_NORMALLY [shape="box",width=3] 
+CONNECTION_RECONFIGURATION [shape="box",width=3] 
+HANDOVER_PREPARATION [shape="box",width=3] 
+HANDOVER_JOINING [shape="box",width=3] 
+HANDOVER_PATH_SWITCH [shape="box",width=3] 
+HANDOVER_LEAVING [shape="box",width=3]
 CONTEXT_DESTROYED [shape="ellipse", label="context destroyed"]
 
-NO_CONTEXT -> INITIAL_RANDOM_ACCESS [label="rx RA preamble",labeldistance=0]
-INITIAL_RANDOM_ACCESS -> CONNECTION_REJECTED [label="rx RRC CONN REQUEST, AdmitRrcConnectionRequest = false"]
-CONNECTION_REJECTED -> CONTEXT_DESTROYED [label="ConnectionRejectedTimeout"]
-INITIAL_RANDOM_ACCESS -> CONTEXT_DESTROYED [label="ConnectionTimeout"]
-INITIAL_RANDOM_ACCESS -> CONNECTION_SETUP [label="rx RRC CONN REQUEST, AdmitRrcConnectionRequest = true"]
-CONNECTION_SETUP -> CONNECTED_NORMALLY [label="rx RRC CONN SETUP COMPLETED"]
-CONNECTED_NORMALLY -> CONNECTION_RECONFIGURATION [label="reconfiguration trigger"]
-CONNECTION_RECONFIGURATION -> CONNECTED_NORMALLY [label="rx RRC CONN RECONF COMPLETED"]
-CONNECTED_NORMALLY -> HANDOVER_PREPARATION [label="handover trigger"]
-HANDOVER_PREPARATION -> CONNECTED_NORMALLY [label="rx X2 HO PREP FAILURE"]
-HANDOVER_PREPARATION -> HANDOVER_LEAVING [label="rx X2 HO REQUEST ACK"]
+// connection establishment
+NO_CONTEXT -> INITIAL_RANDOM_ACCESS [label="rx RA\npreamble"]
+INITIAL_RANDOM_ACCESS -> CONNECTION_REJECTED [label="rx RRC CONN REQ,\nAdmit = false"]
+CONNECTION_REJECTED -> CONTEXT_DESTROYED [label="connection\nrejected\ntimeout"]
+INITIAL_RANDOM_ACCESS -> CONTEXT_DESTROYED [label="connection\ntimeout"]
+INITIAL_RANDOM_ACCESS -> CONNECTION_SETUP [label="rx RRC CONN REQ,\nAdmit = true"]
+CONNECTION_SETUP -> CONNECTED_NORMALLY [label="rx RRC CONN SETUP\nCOMPLETED"]
+CONNECTED_NORMALLY -> CONNECTION_RECONFIGURATION [label="reconfiguration\ntrigger"]
+CONNECTION_RECONFIGURATION -> CONNECTED_NORMALLY [label="rx RRC CONN RECONF\nCOMPLETED"]
+
+// leaving because of handover
+CONNECTED_NORMALLY -> HANDOVER_PREPARATION [label="handover\ntrigger"]
+HANDOVER_PREPARATION -> CONNECTED_NORMALLY [label="rx X2 HO PREP\nFAILURE"]
+HANDOVER_PREPARATION -> HANDOVER_LEAVING [label="rx X2 HO REQ ACK"]
 HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="rx X2 UE CONTEXT RELEASE"]
-HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="HandoverLeavingTimeout"]
-NO_CONTEXT -> HANDOVER_JOINING [label="rx & admit X2 HANDOVER REQUEST"]
-HANDOVER_JOINING -> HANDOVER_PATH_SWITCH [label="RRC CONN RECONF COMPLETED"]
-HANDOVER_JOINING -> CONTEXT_DESTROYED [label="HandoverJoiningTimeout"]
-HANDOVER_PATH_SWITCH -> CONNECTED_NORMALLY [label="rx S1 PATH SWITCH REQUEST ACK"]
+HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="handover\nleaving\ntimeout"]
+
+// joining because of handover
+NO_CONTEXT -> HANDOVER_JOINING [label="rx X2 HANDOVER REQ,\nAdmit = true"]
+HANDOVER_JOINING -> HANDOVER_PATH_SWITCH [label="rx RRC CONN RECONF\nCOMPLETED"]
+HANDOVER_JOINING -> CONTEXT_DESTROYED [label="handover\njoining\ntimeout"]
+HANDOVER_PATH_SWITCH -> CONNECTED_NORMALLY [label="rx S1 PATH SWITCH REQ ACK"]
 
 
-}
\ No newline at end of file
+}
diff --git a/src/lte/doc/source/figures/lte-enb-rrc-states.pdf b/src/lte/doc/source/figures/lte-enb-rrc-states.pdf
index 8705a73b1..e969fdc62 100644
Binary files a/src/lte/doc/source/figures/lte-enb-rrc-states.pdf and b/src/lte/doc/source/figures/lte-enb-rrc-states.pdf differ
diff --git a/src/lte/doc/source/figures/lte-enb-rrc-states.png b/src/lte/doc/source/figures/lte-enb-rrc-states.png
index fbf32572c..8618bcb17 100644
Binary files a/src/lte/doc/source/figures/lte-enb-rrc-states.png and b/src/lte/doc/source/figures/lte-enb-rrc-states.png differ
diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst
index 3ed4e1507..4a6e50779 100644
--- a/src/lte/doc/source/lte-design.rst
+++ b/src/lte/doc/source/lte-design.rst
@@ -1910,7 +1910,7 @@ as implemented in the RRC UE entity.
 .. _fig-lte-ue-rrc-states:
 
 .. figure:: figures/lte-ue-rrc-states.*
-   :scale: 60 %
+   :scale: 70 %
    :align: center
 
    UE RRC State Machine
@@ -1948,6 +1948,7 @@ represented in Figure :ref:`fig-lte-enb-rrc-states`.
 .. _fig-lte-enb-rrc-states:
 
 .. figure:: figures/lte-enb-rrc-states.*
+   :scale: 70 %
    :align: center
 
    ENB RRC State Machine for each UE
@@ -2476,7 +2477,7 @@ Figure :ref:`fig-lte-legacy-handover-algorithm` below summarizes this procedure.
 .. _fig-lte-legacy-handover-algorithm:
 
 .. figure:: figures/lte-legacy-handover-algorithm.*
-   :scale: 60 %
+   :scale: 70 %
    :align: center
 
    A2-A4-RSRQ handover algorithm